Commenting out deprecated functions