Cleaning some mess