removed some unneeded methods