diff --git a/Mage.Client/release/sample-decks/2004/2004 Affinity World Championship Deck Aeo Paquette.dck b/Mage.Client/release/sample-decks/2004/2004 Affinity World Championship Deck Aeo Paquette.dck
index f973836bf3..91239387a4 100644
--- a/Mage.Client/release/sample-decks/2004/2004 Affinity World Championship Deck Aeo Paquette.dck	
+++ b/Mage.Client/release/sample-decks/2004/2004 Affinity World Championship Deck Aeo Paquette.dck	
@@ -18,5 +18,3 @@ SB: 4 [DST:62] Furnace Dragon
 SB: 4 [9ED:216] Seething Song
 SB: 3 [5DN:36] Serum Visions
 SB: 4 [KHM:42] Annul
-LAYOUT MAIN:(1,8)(CARD_TYPE,false,93)|([DST:100],[DST:100],[DST:100],[DST:100],[DST:104],[DST:104],[DST:104],[DST:104],[MRD:172],[MRD:172],[MRD:172],[MRD:172])([MRD:282],[MRD:282],[MRD:282],[MRD:282],[MRD:283],[MRD:283],[MRD:283],[MRD:283],[MRD:286],[MRD:286],[MRD:286],[MRD:286])([MRD:152],[MRD:152],[MRD:152],[MRD:152],[5DN:113],[5DN:113],[5DN:113],[5DN:113],[MRD:274],[MRD:274],[MRD:274],[MRD:274])([AER:167],[AER:167],[AER:167],[AER:167])([MRD:62],[MRD:62],[MRD:62],[MRD:62],[MRD:51],[MRD:51])([M15:161],[M15:161],[M15:161],[M15:161])([DST:163],[DST:163],[DST:163],[MRD:281],[MRD:281],[MRD:281])([MRD:54],[MRD:54],[MRD:54],[MRD:54])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([DST:62],[DST:62],[DST:62],[DST:62],[9ED:216],[9ED:216],[9ED:216],[9ED:216],[5DN:36],[5DN:36],[5DN:36],[KHM:42],[KHM:42],[KHM:42],[KHM:42])
diff --git a/Mage.Client/release/sample-decks/2004/2004 Blue-White Anti-Affinity Control World Championship Deck Gabriel Nassif.dck b/Mage.Client/release/sample-decks/2004/2004 Blue-White Anti-Affinity Control World Championship Deck Gabriel Nassif.dck
index 0dc23c7f4b..9e58cfcede 100644
--- a/Mage.Client/release/sample-decks/2004/2004 Blue-White Anti-Affinity Control World Championship Deck Gabriel Nassif.dck	
+++ b/Mage.Client/release/sample-decks/2004/2004 Blue-White Anti-Affinity Control World Championship Deck Gabriel Nassif.dck	
@@ -19,5 +19,3 @@ SB: 3 [IKO:25] Pacifism
 SB: 2 [5DN:147] Relic Barrier
 SB: 3 [RNA:238] Scrabbling Claws
 SB: 3 [SCG:52] Stifle
-LAYOUT MAIN:(1,5)(CARD_TYPE,false,93)|([5DN:165],[5DN:165],[5DN:165])([SCG:12],[SCG:12],[ONS:28],[ONS:28],[ONS:28])([KHM:42],[KHM:42],[KHM:42],[5DN:27],[5DN:27],[5DN:27],[M12:63],[M12:63],[M12:63],[M12:63],[M21:63],[M21:63],[M21:63],[MRD:53],[MRD:53],[MRD:53],[MRD:53])([MRD:280],[MRD:280],[MRD:280],[MRD:280],[KTK:233],[KTK:233],[KTK:233],[KTK:233],[KHM:395],[KHM:395],[KHM:395],[KHM:395],[KHM:395],[KHM:395],[KHM:395],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[SCG:143],[SCG:143],[SCG:143])([ONS:2],[ONS:2],[SCG:8],[SCG:8],[SCG:8],[SCG:8],[10E:61],[10E:61],[10E:61],[10E:61])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([DST:12],[DST:12],[DST:12],[DST:12],[IKO:25],[IKO:25],[IKO:25],[5DN:147],[5DN:147],[RNA:238],[RNA:238],[RNA:238],[SCG:52],[SCG:52],[SCG:52])
diff --git a/Mage.Client/release/sample-decks/2004/2004 Green-White Astral Slide World Championship Deck Julien Nujiten.dck b/Mage.Client/release/sample-decks/2004/2004 Green-White Astral Slide World Championship Deck Julien Nujiten.dck
index 75b3a2f452..e6756973c7 100644
--- a/Mage.Client/release/sample-decks/2004/2004 Green-White Astral Slide World Championship Deck Julien Nujiten.dck	
+++ b/Mage.Client/release/sample-decks/2004/2004 Green-White Astral Slide World Championship Deck Julien Nujiten.dck	
@@ -19,5 +19,3 @@ SB: 2 [5DN:92] Rude Awakening
 SB: 3 [RNA:238] Scrabbling Claws
 SB: 3 [9ED:11] Circle of Protection: Red
 SB: 3 [8ED:272] Plow Under
-LAYOUT MAIN:(1,5)(CARD_TYPE,false,93)|([10E:308],[10E:308],[10E:308],[10E:308],[5DN:86],[5DN:86],[5DN:86],[5DN:86],[SCG:12],[SCG:12],[SCG:12],[SCG:12])([ONS:4],[ONS:4],[ONS:4],[ONS:4])([AKH:25],[AKH:25],[AKH:25],[AKH:25],[SCG:25],[SCG:25])([KHM:398],[KHM:398],[KHM:398],[KHM:398],[KHM:398],[KHM:398],[KHM:398],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[KHM:394],[ONS:324],[ONS:324],[ONS:324],[ONS:324],[ONS:326],[ONS:326],[ONS:326],[ONS:326],[KTK:248],[KTK:248],[KTK:248],[KTK:248])([ONS:2],[ONS:2],[SCG:8],[SCG:8],[8ED:272],[M12:190],[M12:190],[M12:190],[M12:190],[10E:61],[10E:61],[10E:61],[10E:61])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([DST:79],[DST:79],[DST:79],[DST:79],[5DN:92],[5DN:92],[RNA:238],[RNA:238],[RNA:238],[9ED:11],[9ED:11],[9ED:11],[8ED:272],[8ED:272],[8ED:272])
diff --git a/Mage.Client/release/sample-decks/2004/2004 Myr Incubator Combo World Championship Deck Manuel Bevand.dck b/Mage.Client/release/sample-decks/2004/2004 Myr Incubator Combo World Championship Deck Manuel Bevand.dck
index eb03cbb3db..5686d5915f 100644
--- a/Mage.Client/release/sample-decks/2004/2004 Myr Incubator Combo World Championship Deck Manuel Bevand.dck	
+++ b/Mage.Client/release/sample-decks/2004/2004 Myr Incubator Combo World Championship Deck Manuel Bevand.dck	
@@ -21,5 +21,3 @@ SB: 4 [M12:63] Mana Leak
 SB: 4 [DST:62] Furnace Dragon
 SB: 4 [9ED:216] Seething Song
 SB: 3 [M11:154] Pyroclasm
-LAYOUT MAIN:(1,4)(CARD_TYPE,false,93)|([MRD:278],[MRD:278],[M15:242],[M15:242],[M15:242],[M15:242],[MRD:282],[MRD:282],[MRD:282],[MRD:282],[MRD:283],[MRD:283],[MRD:283],[MRD:283],[MRD:285],[MRD:285],[MRD:285],[MRD:286],[MRD:286])([MRD:152],[MRD:152],[MRD:152],[MRD:152],[MRD:176],[5DN:134],[5DN:134],[5DN:134],[5DN:134],[MRD:212],[MRD:212],[MRD:212],[MRD:212],[5DN:143],[5DN:143],[5DN:143],[5DN:143],[MRD:253],[MRD:253],[MRD:253],[MRD:256],[MRD:256],[MRD:256])([5DN:27],[5DN:27],[5DN:27],[5DN:27],[MRD:53],[MRD:53],[MRD:53])([M10:52],[M10:52],[M10:52],[M12:131],[5DN:36],[5DN:36],[5DN:36],[MRD:54],[MRD:54],[MRD:54],[MRD:54])
-LAYOUT SIDEBOARD:(1,1)(NONE,false,50)|([M12:63],[M12:63],[M12:63],[M12:63],[DST:62],[DST:62],[DST:62],[DST:62],[9ED:216],[9ED:216],[9ED:216],[9ED:216],[M11:154],[M11:154],[M11:154])