Uploads for retired robots

A lot of times, when I stop my rumble client there will be several battles completed that just stay on my machine until the next time I start my rumble client. I've always thought this was fine in the past, but if one of those battles is for a robot who is retired before the next time I start my client, it seems like when it is uploaded the retired robot reappears in the rankings. Should I be trying to avoid this? And if so, how do I clean out the stored battles before starting the rumble client?

It wouldn't hurt. I personally try and shut down my client after it has finished uploading but before the first battle has finished. So there won't be an upload log.