Blacklist and code clean-up