Cleaning the Code Base