ModeSwitcher: Remove obsolete members