Revert "Changes with comments in various files !!!"

This reverts commit 2fdfe18cca47ff101b778dcd19da4dbef255150a.
Change from rhalli

Testing this