removed old mode switch