cleanup the mess with the old self-generated msgId