removed switcher