Fix the archive name todo + log cleanup (there was double logging).

Fix the archive name todo + log cleanup (there was double logging). #780