removing unncessary code