Unplug whitelist - review

Also, this was the original source of the "== YES"; git diff just makes it *look* like I added that ;)

I'll pull the other instances out of the file while I'm here