Remove unused code from old messaging style