Removing code that we won't need based on recent discussions
Implementing smart loading of entity class for table