Remove overrides - they causes more trouble than they were worth