diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 2e0420ef..8d76c4a2 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -2,7 +2,6 @@
 <geometry version="0.90">
   <bounds x="10" y="10" width="410.0000" height="229"/>
   <section angle="0">
-    <row orientation="1">
       <key name="AD01" oref="outline2" />
       <key name="AD02" oref="outline2" />
       <key name="AD03" oref="outline2" />
@@ -13,10 +12,8 @@
       <key name="AD08" oref="outline2" />
       <key name="AD09" oref="outline2" />
       <key name="AD10" oref="outline2" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key name="AC01" oref="outline2" />
       <key name="AC02" oref="outline2" />
       <key name="AC03" oref="outline2" />
@@ -27,10 +24,8 @@
       <key name="AC08" oref="outline2" />
       <key name="AC09" oref="outline2" />
       <key name="AC10" oref="outline2" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key name="LFSH" oref="altline" />
       <key name="AB01" oref="outline2" />
       <key name="AB02" oref="outline2" />
@@ -40,16 +35,13 @@
       <key name="AB06" oref="outline2" />
       <key name="AB07" oref="outline2" />
       <key name="BKSP" oref="altline" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key keycode="0" name="ABC123" oref="altline" />
       <key name="I149" oref="altline" />
       <key name="SPCE" oref="spaceline" />
       <key name="AB08" oref="outline2" />
       <key name="RTRN" oref="outline7" />
-    </row>
   </section>
   <outline id="outline2" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
diff --git a/data/keyboards/geometry/number-keypad.xml b/data/keyboards/geometry/number-keypad.xml
index 2ce06a58..b592cf83 100644
--- a/data/keyboards/geometry/number-keypad.xml
+++ b/data/keyboards/geometry/number-keypad.xml
@@ -2,39 +2,31 @@
 <geometry version="0.90">
   <bounds x="0" y="10.000000" width="426.0000" height="296.5853"/>
   <section angle="0">
-    <row orientation="1">
       <key name="AD01" oref="outline2" />
       <key name="AD02" oref="outline2" />
       <key name="AD03" oref="outline2" />
       <key name="AD04" oref="outline2" />
       <key name="AD05" oref="outline2" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key name="AC01" oref="outline2" />
       <key name="AC02" oref="outline2" />
       <key name="AC03" oref="outline2" />
       <key name="AC04" oref="outline2" />
       <key name="AC05" oref="outline2" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key name="AB01" oref="outline2" />
       <key name="AB02" oref="outline2" />
       <key name="AB03" oref="outline2" />
       <key name="AB04" oref="outline2" />
       <key name="AB05" oref="outline2" />
-    </row>
   </section>
   <section angle="0">
-    <row orientation="1">
       <key name="BKSP" oref="altline" />
       <key name="AB06" oref="outline2" />
       <key name="SPCE" oref="spaceline" />
       <key name="RTRN" oref="outline7" />
-    </row>
   </section>
   <outline id="outline2" corner-radius="1.000000">
     <point x="0.000000" y="0.000000"/>
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index 8db81975..69339e28 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -285,10 +285,7 @@ static const gchar *geometry_valid_path_list[] = {
     "bounds/geometry",
     "section/geometry",
     "outline/geometry",
-    "bounds/section/geometry",
-    "row/section/geometry",
-    "key/row/section/geometry",
-    "bounds/key/row/section/geometry",
+    "key/section/geometry",
     "point/outline/geometry",
 };