-Fix small issue when comments is disabled
-Remove debug statement