Removed excessive overrides