Remove extra unneeded functions