Merge pull request #2594 from Spamcat/BEF-staging

Viro fixes
Removed unneeded checks.
config.usealienwhitelist check is already in the function