Cleaning of some mess