Cleanup
more work done on the train