simple messages cleanups