Cleaning some stuff...