Did a general cleanup.