removed unecessary code again