removed broken switcher