Commenting out some unused stuff