Cleaning up some of the mess.