cleaning up some simulators