Fix: Spam protection for converse
Code cleanup