Commenting out potentially unnecessary code