removed more commented out code
Merge branch 'master' into cole