Remove unneeded functions, simplify things.