Removed switcher variable leftovers.