Removed unneeded functions