Blacklist dead GUID's

and a little refactoring