removed some unneeded parts