General message cleanup