Removed unneeded message envelope API.  Updated classes/tests.