Cleanup leftovers of old searchspam
Merge branch 'nospam' into testing