Generalize whitelist; remove some debug logging