removed a few comments
Merge commit '577c6cba165eaf1a7bf60c88d05a4ebdd120a108'