Removed a few unnecessary overrides