removed unnecessaary codes