[CLEANUP] Drop commented-out code.