Removed Redundant Entity Code