Unplug whitelist

Creating for code review.