Cleaning up some messes