Removed redundant and old whitelists