Removed a bunch of unneeded functions