Remove unneeded overrides