Remove commented-out True/False checks