Remove all the now unused functions