ENTITY_TYPE deleted

replaced via IDE tools (some manual work with imports)