Remove unneeded functions