If this function isn't to be used any more, could we just remove it