I missed removing a couple bits while deleting the scan wifi pref in
Merge pull request #855 from crankycoder/features/767-missed-some-dead-code

Remove some dead code
Merge branch 'dev' into features/629+826-unittest-mozbuild-updates