cut some fat from entity and avatar again