Simulation is now obsolete, tidy up code