cleared up unecessary code