Cleaning up some mess