removed some unneeded code