removed more unecessary code