Cleanup; Adds block whitelist