Removed unnecessary comments

Comments that interfered with conditional commenting have been removed
as they are not necessary.