Remove uneeded functions