Remove unused ID whitelists

Change-Id: I512156e630cdb63f0d268a3a18877fc313db783b
Merge "Remove unused ID whitelists"