removed some unneeded functions