Toggle Sim/Sam

Clean up some of the sim/sam toggle stuff