Remove entities-related code