diff --git a/plex/pmm/collections/general/movies_collections_general.yml b/plex/pmm/collections/general/movies_collections_general.yml
index e0d605f..595528c 100644
--- a/plex/pmm/collections/general/movies_collections_general.yml
+++ b/plex/pmm/collections/general/movies_collections_general.yml
@@ -478,6 +478,8 @@ collections:
 
 dynamic_collections:
   ## Use DC as suffix to avoid name conflicts with static collections
+  ## These get generated in the order they are listed here, so put the more intensive ones at the bottom
+
   Best of Year DC: # mapping name does not matter just needs to be unique
     type: number
     sync: true
@@ -488,70 +490,6 @@ dynamic_collections:
     template:
       - Best_of_Year
 
-  # Per-Actor-Movies DC: # mapping name does not matter just needs to be unique
-    # type: actor
-    # data:
-      # depth: 10  # must be in top X billed actors for a given movie for the movie to be added
-      # minimum: 10 # actor must be in at least X movies to have a collection made
-    # title_format: <<key_name>> (Actor)
-    # template:
-      # - Per_Actor
-
-  # Per-Director DC: # mapping name does not matter just needs to be unique
-    # type: director
-    # data:
-      # depth: 10  # must be in top X billed directors for a given movie for the movie to be added
-      # minimum: 10 # director must be in at least X movies to have a collection made
-    # title_format: <<key_name>> (Director)
-    # template:
-      # - Per_Director
-
-  Per-Country DC: # mapping name does not matter just needs to be unique
-    type: country
-    title_format: Top <<key_name>> Cinema
-    template:
-      - Per_Country
-    key_name_override:
-      France: French
-      Germany: German
-      India: Indian
-      United States: American
-      England: British
-      Japan: Japanese
-      China: Chinese
-      South Korea: Korean
-      Italy: Italian
-      Spain: Spanish
-      Canada: Canadian
-      Mexico: Mexican
-      Australia: Australian
-      Brazil: Brazilian
-      Russia: Russian
-      Argentina: Argentinean
-      Belgium: Belgian
-      Denmark: Danish
-      Finland: Finnish
-      Greece: Greek
-      Iceland: Icelandic
-      Ireland: Irish
-      Netherlands: Dutch
-      New Zealand: New Zealand
-      Norway: Norwegian
-      Poland: Polish
-      Portugal: Portuguese
-      Sweden: Swedish
-      Switzerland: Swiss
-      Turkey: Turkish
-      Ukraine: Ukrainian
-
-  Per-Genre DC: # mapping name does not matter just needs to be unique
-    type: genre
-    exclude:
-      - Talk Show
-    title_format: Top <<key_name>> <<library_type>>s
-    template:
-      - Per_Genre
-
   Per-Holiday DC: # mapping name does not matter just needs to be unique
     type: custom
     data:
@@ -609,7 +547,6 @@ dynamic_collections:
         thanksgiving: range(11/01-11/30)
         christmas: range(12/01-12/31)
         hallmark: range(12/01-12/31)
-      delete_not_scheduled: true
       level:
         years: "++"
         valentine: "++"
@@ -732,3 +669,67 @@ dynamic_collections:
         default: seasonal/<<key>>
       translation_key:
         default: season
+
+  Per-Genre DC: # mapping name does not matter just needs to be unique
+    type: genre
+    exclude:
+      - Talk Show
+    title_format: Top <<key_name>> <<library_type>>s
+    template:
+      - Per_Genre
+
+  Per-Country DC: # mapping name does not matter just needs to be unique
+    type: country
+    title_format: Top <<key_name>> Cinema
+    template:
+      - Per_Country
+    key_name_override:
+      France: French
+      Germany: German
+      India: Indian
+      United States: American
+      England: British
+      Japan: Japanese
+      China: Chinese
+      South Korea: Korean
+      Italy: Italian
+      Spain: Spanish
+      Canada: Canadian
+      Mexico: Mexican
+      Australia: Australian
+      Brazil: Brazilian
+      Russia: Russian
+      Argentina: Argentinean
+      Belgium: Belgian
+      Denmark: Danish
+      Finland: Finnish
+      Greece: Greek
+      Iceland: Icelandic
+      Ireland: Irish
+      Netherlands: Dutch
+      New Zealand: New Zealand
+      Norway: Norwegian
+      Poland: Polish
+      Portugal: Portuguese
+      Sweden: Swedish
+      Switzerland: Swiss
+      Turkey: Turkish
+      Ukraine: Ukrainian
+
+      # Per-Actor-Movies DC: # mapping name does not matter just needs to be unique
+      # type: actor
+      # data:
+      # depth: 10  # must be in top X billed actors for a given movie for the movie to be added
+      # minimum: 10 # actor must be in at least X movies to have a collection made
+      # title_format: <<key_name>> (Actor)
+      # template:
+      # - Per_Actor
+
+      # Per-Director DC: # mapping name does not matter just needs to be unique
+      # type: director
+      # data:
+      # depth: 10  # must be in top X billed directors for a given movie for the movie to be added
+      # minimum: 10 # director must be in at least X movies to have a collection made
+      # title_format: <<key_name>> (Director)
+      # template:
+      # - Per_Director
diff --git a/plex/pmm/templates/dynamic_collections.yml b/plex/pmm/templates/dynamic_collections.yml
index b5c8690..179cb5f 100644
--- a/plex/pmm/templates/dynamic_collections.yml
+++ b/plex/pmm/templates/dynamic_collections.yml
@@ -110,7 +110,6 @@ templates:
       all:
         label: <<smart_label>>
     schedule: <<schedule_<<key>>>>
-    delete_not_scheduled: true
     sync_mode: <<sync_mode_<<key>>>>
     tmdb_collection: <<tmdb_collection_<<key>>>>
     tmdb_movie: <<tmdb_movie_<<key>>>>