removing unneccery content improved