Improve Simulator clean up