remove dead commented out code
Merge remote-tracking branch 'xcamshift/master'