Refactor out unnecessary fields in Simulation to improve simulation speed.