Some cleanup. Stuff happening too fast to see the progress.