remove whitelist check
remove unused args