am e67651c: nexus: Cleanup the scanner and plug it all in so it works

Merge commit 'e67651c89d0cbb759219412d49cbc5680c17df06'

* commit 'e67651c89d0cbb759219412d49cbc5680c17df06':
  nexus: Cleanup the scanner and plug it all in so it works