Remove more uneeded functions