deploy_extra_export: refactoring