removed unused entities
removed unused properties