Remove commented-out debug code