Removed unnecessary overrides