Commenting out variables until fix