Code cleanup

Zhang, Charlotterequested to merge
code-cleanup into master

Remove unnecessary prints and add comments

Merge request reports