Commenting out unused code for now