remove some old messaging code