Remove the simulator stuff