Cleanup; added option to enable/disable the blacklist entirely
Cleanup