Update for latest Herochat
Getting standard
Cleanup imports