Feature/chat 2

Can we remove this?