Scrubber for future version
Improved device discovery
Improved device discovery