Some cleaning
Some updates for the new(ish) groupchats