Remove no-longer-needed special classes mkwsSwitch_targets and