Tidy up some mess.