Cleanup
Also store commute duration in state