fixes, Commented out entity-related classes