Commenting out extra functions