Removed old override stuff