removed unneeded functions