diff --git a/doc/source/library_reference/common/lib/geometry/config.rst b/doc/source/library_reference/common/lib/geometry/config.rst
index 812663a6..01125a1b 100644
--- a/doc/source/library_reference/common/lib/geometry/config.rst
+++ b/doc/source/library_reference/common/lib/geometry/config.rst
@@ -91,18 +91,6 @@ Utility Classes
    :show-inheritance:
    :member-order: groupwise
 
-<<<<<<< HEAD
-=======
-.. currentmodule:: opencsp.common.lib.geometry.ReferenceFrame
-
-.. automodule:: opencsp.common.lib.geometry.ReferenceFrame
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
->>>>>>> github-upstream/develop
 .. currentmodule:: opencsp.common.lib.geometry.RegionXY
 
 .. automodule:: opencsp.common.lib.geometry.RegionXY
@@ -121,15 +109,6 @@ Utility Classes
    :show-inheritance:
    :member-order: groupwise
 
-.. currentmodule:: opencsp.common.lib.geometry.TranslationXYZ
-
-.. automodule:: opencsp.common.lib.geometry.TranslationXYZ
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
 .. currentmodule:: opencsp.common.lib.geometry.Uxy
 
 .. automodule:: opencsp.common.lib.geometry.Uxy
@@ -166,8 +145,8 @@ Utility Classes
    :show-inheritance:
    :member-order: groupwise
 
-Angle Utility Functions
-=======================
+Angle Utility Classes
+=====================
 
 .. currentmodule:: opencsp.common.lib.geometry.angle
 
@@ -178,50 +157,3 @@ Angle Utility Functions
    :show-inheritance:
    :member-order: groupwise
 
-2D Geometry Utility Functions
-=============================
-
-.. currentmodule:: opencsp.common.lib.geometry.geometry_2d
-
-.. automodule:: opencsp.common.lib.geometry.geometry_2d
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
-3D Geometry Utility Functions
-=============================
-
-.. currentmodule:: opencsp.common.lib.geometry.geometry_3d
-
-.. automodule:: opencsp.common.lib.geometry.geometry_3d
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
-3D Matrix Geometry Utility Functions
-====================================
-
-.. currentmodule:: opencsp.common.lib.geometry.matrix_geometry_3d
-
-.. automodule:: opencsp.common.lib.geometry.matrix_geometry_3d
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
-3D Transformation Utility Functions
-===================================
-.. currentmodule:: opencsp.common.lib.geometry.transform_3d
-
-.. automodule:: opencsp.common.lib.geometry.transform_3d
-   :members:
-   :special-members: __init__
-   :undoc-members:
-   :show-inheritance:
-   :member-order: groupwise
-
diff --git a/doc/source/library_reference/common/lib/geometry/index.rst b/doc/source/library_reference/common/lib/geometry/index.rst
index 13e41ff8..e4741bf2 100644
--- a/doc/source/library_reference/common/lib/geometry/index.rst
+++ b/doc/source/library_reference/common/lib/geometry/index.rst
@@ -1,5 +1,4 @@
 Geometry Utilities
-===================
 
 This is a collection of geometry utilities for OpenCSP