discover/device-handler: Ensure we free unresolved boot options on remove