removing unneccesary code