Removing most unneeded functions from utility-functions