diff --git a/python_modules/infra.py b/python_modules/infra.py
index 42f332ba..a502e4e1 100644
--- a/python_modules/infra.py
+++ b/python_modules/infra.py
@@ -69,14 +69,14 @@ class ChrootFolders:
         src_chroot = ('/osrelease/' + self.sbase + self.sarch,
                       '/osrelease/' + self.sbase + self.sarch,
                       '/grub/'+ self.sbase + self.sarch,
-                      '/calamares_settings/' + self.sbase  +  self.sarch  +
-                      '/calamares/modules',
+                      #'/calamares_settings/' + self.sbase  +  self.sarch  +
+                      #'/calamares/modules',
                       '/grub/' + self.sbase + '_themes'
                       )
         des_chroot =('/usr/lib',
                      '/opt/pepconf',
-                     '/etc/default',
-                     '/etc/calamares/modules',
+                     #'/etc/default',
+                     #'/etc/calamares/modules',
                      '/boot/grub/themes'
                      )
         # Chroot Folders.
@@ -144,25 +144,25 @@ class ArchitectureFiles:
         self.sarch = sarch
         calamares_path = '/calamares_settings/'
         sources_path = '/sources/'
-        src_paths = (calamares_path + self.sbase + self.sarch +
-                     '/calamares/settings.conf',
-                     calamares_path + self.sbase + self.sarch +
-                     '/install-peppermint',
-                     calamares_path + self.sbase + self.sarch +
-                     '/sources-final',
-                     calamares_path + self.sbase + self.sarch +
-                     '/bootloader-config',
-                     calamares_path +
-                     'adddesktopicon/add-calamares-desktop-icon',
+        src_paths = (#calamares_path + self.sbase + self.sarch +
+                     #'/calamares/settings.conf',
+                     #calamares_path + self.sbase + self.sarch +
+                     #'/install-peppermint',
+                     #calamares_path + self.sbase + self.sarch +
+                     #'/sources-final',
+                     #calamares_path + self.sbase + self.sarch +
+                     #'/bootloader-config',
+                     #calamares_path +
+                     #'adddesktopicon/add-calamares-desktop-icon',
                      sources_path + self.sbase + self.sarch +
                      '/sources.list', 
                      '/id_files/pep_id'
                       )
-        des_paths = ('/etc/calamares/settings.conf',
-                     '/usr/bin/install-peppermint',
-                     '/usr/sbin/sources-final',
-                     '/usr/sbin/bootloader-config',
-                     '/usr/bin/add-calamares-desktop-icon',
+        des_paths = (#'/etc/calamares/settings.conf',
+                     #'/usr/bin/install-peppermint',
+                     #'/usr/sbin/sources-final',
+                     #'/usr/sbin/bootloader-config',
+                     #'/usr/bin/add-calamares-desktop-icon',
                      '/opt/pepconf/sources.list',
                      '/usr/share/peppermint/pep_id'
                       )
@@ -226,7 +226,7 @@ def shared_folders():
                  '/pmostools',
                  '/autostart',
                  '/pylibraries',
-                 '/calamares_settings/branding'
+                 #'/calamares_settings/branding'
                  )
     des_paths =('/usr/share/plymouth/themes/lines',
                 '/usr/share/applications', 
@@ -245,7 +245,7 @@ def shared_folders():
                 '/etc/skel/.local/share/pmostools',
                 '/etc/skel/.config/autostart',
                 '/usr/lib/python3/dist-packages',
-                '/etc/calamares/branding'
+                #'/etc/calamares/branding'
                 )
     src_q = collections.deque(src_paths)
     des_q = collections.deque(des_paths)