Remove obsolete variables

Also fix BLACKLIST checks