removed unecessary code&comment