Remove old simulation methods
Moved the primary versus handling into simulator.py