yet more message cleanup