took away unneccessary code