Merge "Remove some commented-out code."