remove Riak code from Message (not needed yet)