Will now remove fly from non-ops at stop