Cleaning. Remove unused code.