Get rid of some unneeded funcitons