Getting rid of commented code and not used use statements.