removed unecessary code