HR-294 partial fix
Removed comments
Merge pull request #444 from monishdeb/HR-294

Hr 294