Fixed unecessary code