[fix] commenting and removal of extraneous code
Merge remote-tracking branch 'origin/master'