Unnecessary comments removed, as part of code cleanup