EJPLUGIN-157;  clean up message system