diff --git a/smr/fresh/geometry.xml b/smr/fresh/geometry.xml
index 40f5504..68df767 100644
--- a/smr/fresh/geometry.xml
+++ b/smr/fresh/geometry.xml
@@ -439,62 +439,19 @@
   <cell id="1215" material="8" name="Assembly (3.1%) no BAs instr lattice axial (6)" region="28 -29 30 -31 ~(24 -25 26 -27) 44 -45" universe="184" />
   <cell id="1216" material="4" name="Assembly (3.1%) no BAs instr lattice axial (7)" region="28 -29 30 -31 ~(24 -25 26 -27) 45 -46" universe="184" />
   <cell id="1217" material="8" name="Assembly (3.1%) no BAs instr lattice axial (last)" region="28 -29 30 -31 ~(24 -25 26 -27) 46" universe="184" />
-  <cell id="1339" material="4" name="baffle dummy SS" region="82" universe="207" />
-  <cell id="1340" material="8" name="baffle south water" region="-82" universe="207" />
-  <cell fill="208" id="1341" name="baffle south" universe="209" />
-  <cell id="1342" material="8" name="baffle dummy SS" region="83" universe="210" />
-  <cell id="1343" material="4" name="baffle north water" region="-83" universe="210" />
-  <cell fill="211" id="1344" name="baffle north" universe="212" />
-  <cell id="1345" material="4" name="baffle dummy SS" region="84" universe="213" />
-  <cell id="1346" material="8" name="baffle west water" region="-84" universe="213" />
-  <cell fill="214" id="1347" name="baffle west" universe="215" />
-  <cell id="1348" material="8" name="baffle dummy SS" region="85" universe="216" />
-  <cell id="1349" material="4" name="baffle east water" region="-85" universe="216" />
-  <cell fill="217" id="1350" name="baffle east" universe="218" />
-  <cell id="1351" material="8" name="baffle southeast dummy 1" region="85 -82" universe="219" />
-  <cell id="1352" material="4" name="baffle southeast dummy 2" region="85 82" universe="219" />
-  <cell id="1353" material="4" name="baffle southeast dummy 3" region="-85" universe="219" />
-  <cell fill="220" id="1354" name="baffle southeast" universe="221" />
-  <cell id="1355" material="8" name="baffle southwest dummy 1" region="-82 -84" universe="222" />
-  <cell id="1356" material="4" name="baffle southwest dummy 2" region="82 -84" universe="222" />
-  <cell id="1357" material="4" name="baffle southwest dummy 3" region="84" universe="222" />
-  <cell fill="223" id="1358" name="baffle southwest" universe="224" />
-  <cell id="1359" material="8" name="baffle northeast dummy 1" region="83 85" universe="225" />
-  <cell id="1360" material="4" name="baffle northeast dummy 2" region="-83 85" universe="225" />
-  <cell id="1361" material="4" name="baffle northeast dummy 3" region="-85" universe="225" />
-  <cell fill="226" id="1362" name="baffle northeast" universe="227" />
-  <cell id="1363" material="8" name="baffle northwest dummy 1" region="83 -84" universe="228" />
-  <cell id="1364" material="4" name="baffle northwest dummy 2" region="-83 -84" universe="228" />
-  <cell id="1365" material="4" name="baffle northwest dummy 3" region="84" universe="228" />
-  <cell fill="229" id="1366" name="baffle northwest" universe="230" />
-  <cell id="1367" material="8" name="baffle southeast corner dummy 1" region="-85 -82" universe="231" />
-  <cell id="1368" material="8" name="baffle southeast corner dummy 2" region="85" universe="231" />
-  <cell id="1369" material="4" name="baffle southeast corner dummy 3" region="82 -85" universe="231" />
-  <cell fill="232" id="1370" name="baffle southeast corner" universe="233" />
-  <cell id="1371" material="8" name="baffle southwest corner dummy 1" region="84 -82" universe="234" />
-  <cell id="1372" material="8" name="baffle southwest corner dummy 2" region="-84" universe="234" />
-  <cell id="1373" material="4" name="baffle southwest corner dummy 3" region="82 84" universe="234" />
-  <cell fill="235" id="1374" name="baffle southwest corner" universe="236" />
-  <cell id="1375" material="8" name="baffle northwest corner dummy 1" region="84 83" universe="237" />
-  <cell id="1376" material="8" name="baffle northwest corner dummy 2" region="-84" universe="237" />
-  <cell id="1377" material="4" name="baffle northwest corner dummy 3" region="-83 84" universe="237" />
-  <cell fill="238" id="1378" name="baffle northwest corner" universe="239" />
-  <cell id="1379" material="8" name="baffle northeast corner dummy 1" region="-85 83" universe="240" />
-  <cell id="1380" material="8" name="baffle northeast corner dummy 2" region="85" universe="240" />
-  <cell id="1381" material="4" name="baffle northeast corner dummy 3" region="-83 -85" universe="240" />
-  <cell fill="241" id="1382" name="baffle northeast corner" universe="242" />
-  <cell fill="243" id="1383" name="Main core" region="-71 81 -80" universe="0" />
-  <cell id="1384" material="4" name="core barrel" region="71 -72 81 -80" universe="0" />
-  <cell id="1385" material="4" name="neutron shield panel NW" region="72 -73 74 -75 81 -80" universe="0" />
-  <cell id="1386" material="8" name="neutron shield panel N" region="72 -73 75 -77 81 -80" universe="0" />
-  <cell id="1387" material="4" name="neutron shield panel SE" region="72 -73 -74 75 81 -80" universe="0" />
-  <cell id="1388" material="8" name="neutron shield panel E" region="72 -73 74 76 81 -80" universe="0" />
-  <cell id="1389" material="4" name="neutron shield panel NE" region="72 -73 76 -77 81 -80" universe="0" />
-  <cell id="1390" material="8" name="neutron shield panel S" region="72 -73 -75 77 81 -80" universe="0" />
-  <cell id="1391" material="4" name="neutron shield panel SW" region="72 -73 -76 77 81 -80" universe="0" />
-  <cell id="1392" material="8" name="neutron shield panel W" region="72 -73 -74 -76 81 -80" universe="0" />
-  <cell id="1393" material="8" name="downcomer" region="73 -78 81 -80" universe="0" />
-  <cell id="1394" material="5" name="reactor pressure vessel" region="78 -79 81 -80" universe="0" />
+  <cell id="1339" material="4" name="heavy reflector SS" universe="207" />
+  <cell fill="244" id="1384" name="Main core" region="-71 81 -80" universe="0" />
+  <cell id="1385" material="4" name="core barrel" region="71 -72 81 -80" universe="0" />
+  <cell id="1386" material="4" name="neutron shield panel NW" region="72 -73 74 -75 81 -80" universe="0" />
+  <cell id="1387" material="8" name="neutron shield panel N" region="72 -73 75 -77 81 -80" universe="0" />
+  <cell id="1388" material="4" name="neutron shield panel SE" region="72 -73 -74 75 81 -80" universe="0" />
+  <cell id="1389" material="8" name="neutron shield panel E" region="72 -73 74 76 81 -80" universe="0" />
+  <cell id="1390" material="4" name="neutron shield panel NE" region="72 -73 76 -77 81 -80" universe="0" />
+  <cell id="1391" material="8" name="neutron shield panel S" region="72 -73 -75 77 81 -80" universe="0" />
+  <cell id="1392" material="4" name="neutron shield panel SW" region="72 -73 -76 77 81 -80" universe="0" />
+  <cell id="1393" material="8" name="neutron shield panel W" region="72 -73 -74 -76 81 -80" universe="0" />
+  <cell id="1394" material="8" name="downcomer" region="73 -78 81 -80" universe="0" />
+  <cell id="1395" material="5" name="reactor pressure vessel" region="78 -79 81 -80" universe="0" />
   <lattice id="125" name="Assembly (1.6%) no BAs instr">
     <pitch>1.25984 1.25984</pitch>
     <dimension>17 17</dimension>
@@ -587,126 +544,20 @@
 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 
 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 106 </universes>
   </lattice>
-  <lattice id="208" name="baffle south">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-207 207 
-1 1 </universes>
-  </lattice>
-  <lattice id="211" name="baffle north">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 1 
-210 210 </universes>
-  </lattice>
-  <lattice id="214" name="baffle west">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 213 
-1 213 </universes>
-  </lattice>
-  <lattice id="217" name="baffle east">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-216 1 
-216 1 </universes>
-  </lattice>
-  <lattice id="220" name="baffle southeast">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-219 207 
-216 1 </universes>
-  </lattice>
-  <lattice id="223" name="baffle southwest">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-207 222 
-1 213 </universes>
-  </lattice>
-  <lattice id="226" name="baffle northeast">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-216 1 
-225 210 </universes>
-  </lattice>
-  <lattice id="229" name="baffle northwest">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 213 
-210 228 </universes>
-  </lattice>
-  <lattice id="232" name="baffle southeast corner">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-231 1 
-1 1 </universes>
-  </lattice>
-  <lattice id="235" name="baffle southwest corner">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 234 
-1 1 </universes>
-  </lattice>
-  <lattice id="238" name="baffle northwest corner">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 1 
-1 237 </universes>
-  </lattice>
-  <lattice id="241" name="baffle northeast corner">
-    <pitch>10.751819999999999 10.751819999999999</pitch>
-    <dimension>2 2</dimension>
-    <lower_left>-10.751819999999999 -10.751819999999999</lower_left>
-    <universes>
-1 1 
-240 1 </universes>
-  </lattice>
-  <lattice id="243" name="Main core">
+  <lattice id="244" name="Main core">
     <pitch>21.503639999999997 21.503639999999997</pitch>
-    <dimension>19 19</dimension>
-    <lower_left>-204.28457999999998 -204.28457999999998</lower_left>
+    <dimension>9 9</dimension>
+    <lower_left>-96.76637999999998 -96.76637999999998</lower_left>
     <universes>
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 239 212 212 212 242 1 1 1 1 1 1 1 
-1 1 1 1 1 1 239 230 184 146 184 227 242 1 1 1 1 1 1 
-1 1 1 1 1 239 230 184 146 166 146 184 227 242 1 1 1 1 1 
-1 1 1 1 1 215 184 146 166 146 166 146 184 218 1 1 1 1 1 
-1 1 1 1 1 215 146 166 146 126 146 166 146 218 1 1 1 1 1 
-1 1 1 1 1 215 184 146 166 146 166 146 184 218 1 1 1 1 1 
-1 1 1 1 1 236 224 184 146 166 146 184 221 233 1 1 1 1 1 
-1 1 1 1 1 1 236 224 184 146 184 221 233 1 1 1 1 1 1 
-1 1 1 1 1 1 1 236 209 209 209 233 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 
-1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 </universes>
+207 207 207 207 207 207 207 207 207 
+207 207 207 184 146 184 207 207 207 
+207 207 184 146 166 146 184 207 207 
+207 184 146 166 146 166 146 184 207 
+207 146 166 146 126 146 166 146 207 
+207 184 146 166 146 166 146 184 207 
+207 207 184 146 166 146 184 207 207 
+207 207 207 184 146 184 207 207 207 
+207 207 207 207 207 207 207 207 207 </universes>
   </lattice>
   <surface coeffs="0.0 0.0 0.405765" id="1" name="Pellet OR" type="z-cylinder" />
   <surface coeffs="0.0 0.0 0.06459" id="2" name="FR Plenum Spring OR" type="z-cylinder" />
@@ -773,8 +624,4 @@
   <surface boundary="vacuum" coeffs="0.0 0.0 135.0" id="79" name="RPV OR" type="z-cylinder" />
   <surface boundary="vacuum" coeffs="272.564" id="80" name="upper problem boundary" type="z-plane" />
   <surface boundary="vacuum" coeffs="0.0" id="81" name="lower problem boundary" type="z-plane" />
-  <surface coeffs="3.153409999999999" id="82" name="baffle north" type="y-plane" />
-  <surface coeffs="-3.153409999999999" id="83" name="baffle south" type="y-plane" />
-  <surface coeffs="3.153409999999999" id="84" name="baffle east" type="x-plane" />
-  <surface coeffs="-3.153409999999999" id="85" name="baffle west" type="x-plane" />
 </geometry>
diff --git a/smr/smr/baffle.py b/smr/smr/baffle.py
index 793dc2f..9cc849e 100644
--- a/smr/smr/baffle.py
+++ b/smr/smr/baffle.py
@@ -7,6 +7,18 @@ from .surfaces import surfs, lattice_pitch
 from .assemblies import univs
 
 
+#### HEAVY REFLECTOR
+
+cell = openmc.Cell(
+    name='heavy reflector SS',
+    fill=mats['SS']
+)
+
+univs['heavy reflector'] = openmc.Universe(
+    name='heavy reflector',
+    cells=[cell]
+)
+
 #### SOUTH BAFFLE
 
 univs['baffle south dummy'] = openmc.Universe(name='baffle south dummy')
diff --git a/smr/smr/core.py b/smr/smr/core.py
index bf5c336..5984985 100644
--- a/smr/smr/core.py
+++ b/smr/smr/core.py
@@ -12,90 +12,90 @@ from .baffle import univs
 #### CONSTRUCT MAIN CORE LATTICE
 
 core = openmc.RectLattice(name='Main core')
-core.lower_left = [-19.*lattice_pitch/2., -19.*lattice_pitch/2.]
+core.lower_left = [-9*lattice_pitch/2, -9*lattice_pitch/2]
 core.pitch = [lattice_pitch, lattice_pitch]
-universes = np.empty((19,19), dtype=openmc.Universe)
-universes[:,:] = univs['water pin']
+universes = np.tile(univs['heavy reflector'], (9,9))
+
+universes[0, 2] = univs['heavy reflector']
+universes[0, 3] = univs['heavy reflector']
+universes[0, 4] = univs['heavy reflector']
+universes[0, 5] = univs['heavy reflector']
+universes[0, 6] = univs['heavy reflector']
+
+universes[1, 1] = univs['heavy reflector']
+universes[1, 2] = univs['heavy reflector']
+universes[1, 3] = univs['Assembly (3.1%) instr']
+universes[1, 4] = univs['Assembly (2.4%) CR D']
+universes[1, 5] = univs['Assembly (3.1%) instr']
+universes[1, 6] = univs['heavy reflector']
+universes[1, 7] = univs['heavy reflector']
+
+universes[2, 0] = univs['heavy reflector']
+universes[2, 1] = univs['heavy reflector']
+universes[2, 2] = univs['Assembly (3.1%) instr']
+universes[2, 3] = univs['Assembly (2.4%) CR D']
+universes[2, 4] = univs['Assembly (3.1%) 16BA']
+universes[2, 5] = univs['Assembly (2.4%) CR D']
+universes[2, 6] = univs['Assembly (3.1%) instr']
+universes[2, 7] = univs['heavy reflector']
+universes[2, 8] = univs['heavy reflector']
+
+universes[3, 0] = univs['heavy reflector']
+universes[3, 1] = univs['Assembly (3.1%) instr']
+universes[3, 2] = univs['Assembly (2.4%) CR D']
+universes[3, 3] = univs['Assembly (3.1%) 16BA']
+universes[3, 4] = univs['Assembly (2.4%) CR D']
+universes[3, 5] = univs['Assembly (3.1%) 16BA']
+universes[3, 6] = univs['Assembly (2.4%) CR D']
+universes[3, 7] = univs['Assembly (3.1%) instr']
+universes[3, 8] = univs['heavy reflector']
+
+universes[4, 0] = univs['heavy reflector']
+universes[4, 1] = univs['Assembly (2.4%) CR D']
+universes[4, 2] = univs['Assembly (3.1%) 16BA']
+universes[4, 3] = univs['Assembly (2.4%) CR D']
+universes[4, 4] = univs['Assembly (1.6%) instr']
+universes[4, 5] = univs['Assembly (2.4%) CR D']
+universes[4, 6] = univs['Assembly (3.1%) 16BA']
+universes[4, 7] = univs['Assembly (2.4%) CR D']
+universes[4, 8] = univs['heavy reflector']
+
+universes[5, 0] = univs['heavy reflector']
+universes[5, 1] = univs['Assembly (3.1%) instr']
+universes[5, 2] = univs['Assembly (2.4%) CR D']
+universes[5, 3] = univs['Assembly (3.1%) 16BA']
+universes[5, 4] = univs['Assembly (2.4%) CR D']
+universes[5, 5] = univs['Assembly (3.1%) 16BA']
+universes[5, 6] = univs['Assembly (2.4%) CR D']
+universes[5, 7] = univs['Assembly (3.1%) instr']
+universes[5, 8] = univs['heavy reflector']
+
+universes[6, 0] = univs['heavy reflector']
+universes[6, 1] = univs['heavy reflector']
+universes[6, 2] = univs['Assembly (3.1%) instr']
+universes[6, 3] = univs['Assembly (2.4%) CR D']
+universes[6, 4] = univs['Assembly (3.1%) 16BA']
+universes[6, 5] = univs['Assembly (2.4%) CR D']
+universes[6, 6] = univs['Assembly (3.1%) instr']
+universes[6, 7] = univs['heavy reflector']
+universes[6, 8] = univs['heavy reflector']
+
+universes[7, 1] = univs['heavy reflector']
+universes[7, 2] = univs['heavy reflector']
+universes[7, 3] = univs['Assembly (3.1%) instr']
+universes[7, 4] = univs['Assembly (2.4%) CR D']
+universes[7, 5] = univs['Assembly (3.1%) instr']
+universes[7, 6] = univs['heavy reflector']
+universes[7, 7] = univs['heavy reflector']
+
+universes[8, 2] = univs['heavy reflector']
+universes[8, 3] = univs['heavy reflector']
+universes[8, 4] = univs['heavy reflector']
+universes[8, 5] = univs['heavy reflector']
+universes[8, 6] = univs['heavy reflector']
+
 core.universes = universes
 
-core.universes[5, 7] = univs['baffle northwest corner']
-core.universes[5, 8] = univs['baffle north']
-core.universes[5, 9] = univs['baffle north']
-core.universes[5, 10] = univs['baffle north']
-core.universes[5, 11] = univs['baffle northeast corner']
-
-core.universes[6, 6] = univs['baffle northwest corner']
-core.universes[6, 7] = univs['baffle northwest']
-core.universes[6, 8] = univs['Assembly (3.1%) instr']
-core.universes[6, 9] = univs['Assembly (2.4%) CR D']
-core.universes[6, 10] = univs['Assembly (3.1%) instr']
-core.universes[6, 11] = univs['baffle northeast']
-core.universes[6, 12] = univs['baffle northeast corner']
-
-core.universes[7, 5] = univs['baffle northwest corner']
-core.universes[7, 6] = univs['baffle northwest']
-core.universes[7, 7] = univs['Assembly (3.1%) instr']
-core.universes[7, 8] = univs['Assembly (2.4%) CR D']
-core.universes[7, 9] = univs['Assembly (3.1%) 16BA']
-core.universes[7, 10] = univs['Assembly (2.4%) CR D']
-core.universes[7, 11] = univs['Assembly (3.1%) instr']
-core.universes[7, 12] = univs['baffle northeast']
-core.universes[7, 13] = univs['baffle northeast corner']
-
-core.universes[8, 5] = univs['baffle west']
-core.universes[8, 6] = univs['Assembly (3.1%) instr']
-core.universes[8, 7] = univs['Assembly (2.4%) CR D']
-core.universes[8, 8] = univs['Assembly (3.1%) 16BA']
-core.universes[8, 9] = univs['Assembly (2.4%) CR D']
-core.universes[8, 10] = univs['Assembly (3.1%) 16BA']
-core.universes[8, 11] = univs['Assembly (2.4%) CR D']
-core.universes[8, 12] = univs['Assembly (3.1%) instr']
-core.universes[8, 13] = univs['baffle east']
-
-core.universes[9, 5] = univs['baffle west']
-core.universes[9, 6] = univs['Assembly (2.4%) CR D']
-core.universes[9, 7] = univs['Assembly (3.1%) 16BA']
-core.universes[9, 8] = univs['Assembly (2.4%) CR D']
-core.universes[9, 9] = univs['Assembly (1.6%) instr']
-core.universes[9, 10] = univs['Assembly (2.4%) CR D']
-core.universes[9, 11] = univs['Assembly (3.1%) 16BA']
-core.universes[9, 12] = univs['Assembly (2.4%) CR D']
-core.universes[9, 13] = univs['baffle east']
-
-core.universes[10, 5] = univs['baffle west']
-core.universes[10, 6] = univs['Assembly (3.1%) instr']
-core.universes[10, 7] = univs['Assembly (2.4%) CR D']
-core.universes[10, 8] = univs['Assembly (3.1%) 16BA']
-core.universes[10, 9] = univs['Assembly (2.4%) CR D']
-core.universes[10, 10] = univs['Assembly (3.1%) 16BA']
-core.universes[10, 11] = univs['Assembly (2.4%) CR D']
-core.universes[10, 12] = univs['Assembly (3.1%) instr']
-core.universes[10, 13] = univs['baffle east']
-
-core.universes[11, 5] = univs['baffle southwest corner']
-core.universes[11, 6] = univs['baffle southwest']
-core.universes[11, 7] = univs['Assembly (3.1%) instr']
-core.universes[11, 8] = univs['Assembly (2.4%) CR D']
-core.universes[11, 9] = univs['Assembly (3.1%) 16BA']
-core.universes[11, 10] = univs['Assembly (2.4%) CR D']
-core.universes[11, 11] = univs['Assembly (3.1%) instr']
-core.universes[11, 12] = univs['baffle southeast']
-core.universes[11, 13] = univs['baffle southeast corner']
-
-core.universes[12, 6] = univs['baffle southwest corner']
-core.universes[12, 7] = univs['baffle southwest']
-core.universes[12, 8] = univs['Assembly (3.1%) instr']
-core.universes[12, 9] = univs['Assembly (2.4%) CR D']
-core.universes[12, 10] = univs['Assembly (3.1%) instr']
-core.universes[12, 11] = univs['baffle southeast']
-core.universes[12, 12] = univs['baffle southeast corner']
-
-core.universes[13, 7] = univs['baffle southwest corner']
-core.universes[13, 8] = univs['baffle south']
-core.universes[13, 9] = univs['baffle south']
-core.universes[13, 10] = univs['baffle south']
-core.universes[13, 11] = univs['baffle southeast corner']
-
 
 #### CONSTRUCT ROOT UNIVERSE AND CELLS
 
@@ -204,4 +204,4 @@ root_univ.add_cell(cell)
 
 #### CONSTRUCT GEOMETRY
 
-geometry = openmc.Geometry(root_univ)
\ No newline at end of file
+geometry = openmc.Geometry(root_univ)