Tidy up redundant overrides