Removed calls to _switch.m