Cleanup call on close chat
Clean up call on close
Merge branch 'master' of https://github.com/SuperSimen/kitten-mittons