Commenting out some code that will not be used