Deleted some unneeded functions