removed more unneccessary code