switcher cleanup