We should either remove these functions entirely or move them into a separate library
We should either remove these functions entirely or move them into a separate library