removing unnessecary code