Commenting out cleanup