Chatcommands cleanup

So much cleaning to prep for the biggest release yet