Removing unneccesary code