Add cleanup for chats
Finish cleanup subproject