before clean up
clean up comments and commented out code