Some cleanup 

- removal of references to the old blacklist