removing unnessisary code