Did a lot of cleanup.