Get rid of some leftover functions