Major cleanup and repeating simulation