Commenting out uneeded functions