Removed some comments

Removed those comments which were commented out parts of code used in
debugging which is no longer needed.
Merge branch 'Without-comments'