removed the unecessary code