Remove deprecated functions

They were meant to be removed a while ago, might be a good time to remove them now.