Lots of comment and logging messages updates

Removed a few lines of commented code