Removed unnecessary code from Entities