Remove unwanted overrides