Entity refactoring to make everything consistant
Deleted unnecessary SObjectUtil class