message cleanups