cleaned out commented code: master