Unplug whitelist

Creating for code review.
Shoudl definitely check for null there -- to avoid NPE at the very least