Removed Redundant getEntity code and replaced
Cleanup