Cleaning some code.