Merge fix: remove Blacklist related items

Change-Id: I6f8a03ba3fa3ea4cdc2333f89a5f2550ef5fa2e1