Cleaning some stuff