NR-617 : Test and fix media archive because of security changes / refactoring

cleanup