working on the removal of Simulation class