removing unnecesary code