Commenting out problematic bits