get rid of 587 lines of commented code