Remove unnecessary overrides