Cleaning of some stuff