removed whitelist from TODO