more removing of old messenger system