Removed switcher references