Remove on_discovery after discovered data arrived