Fixing #196 Goodbye Spammer Integration

Fixes merge leftovers - or something else..