Some cleanup in IsRetired()