diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
index a5a19e9..9f46580 100755
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
+++ b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinaryImage.isml
@@ -14,14 +14,12 @@
     assets.addJs('js/cloudinaryImages.js');
 </isscript>
 
-
-<!-- Uncomment this to expose the raw view model for debugging: -->
 <script>
   var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
   window.cldImages = window.cldImages || [];
   window.cldImages.push(value);
   window.cloudName = value.cloudName;
-  window.cnamw = value.cname || null;
+  window.cname = value.cname || null;
   console.log(value);
 </script>
 
diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_image.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_image.isml
deleted file mode 100755
index 1d17e6f..0000000
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_image.isml
+++ /dev/null
@@ -1,28 +0,0 @@
-<iscomment>
-	Cloudinary Video Component Template:
-	This document renders an instance of the component. Multiple instances can be placed on the page.
-
-	Refer to module_pagedesigner_custom/cartridge/experience/components/assets/cloudinary_video.js
-</iscomment>
-<isscript>
-	// SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
-    var assets = require('*/cartridge/scripts/assets.js');
-
-	// Cloudinary Core JS
-	src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-    	assets.addJs(src);
-	}
-
-</isscript>
-
-<iscomment>
-	<!-- Uncomment this to expose the raw view model for debugging: -->
-	<div style="font-size: 11px; word-break: break-all;">
-		${JSON.stringify(pdict.viewmodel)}<br />
-	</div>
-</iscomment>
-<div class="cloudinary-video-container sfdc-component-mock sfdc-component-assets-media_library_image-mock">
-<img alt="pdict.viewmodel.alt" src="pdict.viewmodel.src">
-</div>
-
diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_video.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_video.isml
deleted file mode 100755
index 0cf1359..0000000
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/cloudinary_video.isml
+++ /dev/null
@@ -1,43 +0,0 @@
-<iscomment>
-	Cloudinary Video Component Template:
-	This document renders an instance of the component. Multiple instances can be placed on the page.
-	
-	Refer to module_pagedesigner_custom/cartridge/experience/components/assets/cloudinary_video.js
-</iscomment>
-<isscript>
-	// SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
-    var assets = require('*/cartridge/scripts/assets.js');
-
-	// Video Player CSS
-	var src = 'https://unpkg.com/cloudinary-video-player/dist/cld-video-player.min.css';
-    if (assets.styles.lastIndexOf(src) < 0) {
-    	assets.addCss(src);
-	}
-
-	// Cloudinary Core JS
-	src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-    	assets.addJs(src);
-	}
-
-	// Cloudinary Video Player JS	
-	src = 'https://unpkg.com/cloudinary-video-player/dist/cld-video-player.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-		assets.addJs(src);
-	}
-	
-    assets.addJs('/js/cloudinary-videos.js');
-</isscript>
-
-<div class="cloudinary-video-container sfdc-component-mock sfdc-component-assets-media_library_video-mock">
-    <video id="${pdict.viewmodel.id}"></video>
-<script> 
-  var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
-  window.players = window.players || [];
-  window.players.push(value);
-  window.cloudName = value.cloudName;
-  window.cname = value.cname || null;
-  console.log(value);
-</script>
-</div>
-
diff --git a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/media_library.isml b/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/media_library.isml
deleted file mode 100755
index 9ecfe4b..0000000
--- a/cartridges/int_cloudinary_pd/cartridge/templates/default/experience/components/assets/media_library.isml
+++ /dev/null
@@ -1,42 +0,0 @@
-<iscomment>
-    Cloudinary Media Library Template:
-    This document renders an instance of the component. Multiple instances can be placed on the page.
-
-</iscomment>
-<isscript>
-    // SFRA has a logic bug where full urls are added twice, so we need to check for duplicates before adding.
-    assets = require('*/cartridge/scripts/assets.js');
-    // Cloudinary Core JS
-    var src = 'https://unpkg.com/cloudinary-core/cloudinary-core-shrinkwrap.min.js';
-    if (assets.scripts.lastIndexOf(src) < 0) {
-        assets.addJs(src);
-    }
-    assets.addJs('js/cloudinary-images.js');
-</isscript>
-
-
-<!-- Uncomment this to expose the raw view model for debugging: -->
-<script>
-  var value = JSON.parse('<isprint value="${JSON.stringify(pdict.viewmodel)}" encoding="jsonvalue"/>');
-  window.cldImages = window.cldImages || [];
-  window.cldImages.push(value);
-  window.cloudName = value.cloudName;
-  window.cnamw = value.cname || null;
-  console.log(value);
-</script>
-
-
-<div class="cloudinary-media-library-container sfdc-component-mock sfdc-component-assets-media_library-mock">
-<isif condition="${pdict.viewmodel.placeholder}">
-<isif condition="${pdict.viewmodel.imageLink}">
-    <a href="${pdict.viewmodel.imageLink}">
-</isif>
-    <img class="component-media_library ml-image" src="${pdict.viewmodel.placeholder}"  data-real-url="${pdict.viewmodel.src}"
-    id="${pdict.viewmodel.id}"
-    alt="${pdict.viewmodel.altText}"
-    style="max-width: 100%">
-<isif condition="${pdict.viewmodel.imageLink}">
-</a>
-</isif>
-    </isif>
-</div>
\ No newline at end of file