Removing override switch