Clean up Entity Code
Removed uneeded classes