Issue 4097: Removed unwanted comments