Cleanup
- fix message publish go away