woops, actually remove the winswitch stuff here