Did a little more cleanup.