clean out commented out code
clean more code