Commented-out code - intentional? If so, please add an explanation.