Unplug whitelist

Creating for code review.
Should call this from AndroidBridge as well I think.