Remove some more unnecessary overrides.