cleanups from encryption message mutator PR