Small change

Removed some entity classes