Cleaning up some mess.