removed more unneeded code