Cleanup

Plus
https://github.com/rymate1234/bChatManager/pull/7