(And I snuck some chat command cleanup in there, more de-cluttering!) (cherry picked from commit 88d446dadf65bf47c72d3042834281233b1174ac)
(And I snuck some chat command cleanup in there, more de-cluttering!) (cherry picked from commit 88d446dadf65bf47c72d3042834281233b1174ac)