Update simulation
Cleanup