diff --git a/src/constants.F90 b/src/constants.F90
index b7b02d86f3..9708e9575d 100644
--- a/src/constants.F90
+++ b/src/constants.F90
@@ -112,12 +112,7 @@ module constants
        SURF_SPHERE =  8, & ! Sphere
        SURF_CONE_X =  9, & ! Cone parallel to x-axis
        SURF_CONE_Y = 10, & ! Cone parallel to y-axis
-       SURF_CONE_Z = 11, & ! Cone parallel to z-axis
-       SURF_BOX_X  = 12, & ! Box extending infinitely in x-direction
-       SURF_BOX_Y  = 13, & ! Box extending infinitely in y-direction
-       SURF_BOX_Z  = 14, & ! Box extending infinitely in z-direction
-       SURF_BOX    = 15, & ! Rectangular prism
-       SURF_GQ     = 16    ! General quadratic surface
+       SURF_CONE_Z = 11    ! Cone parallel to z-axis
 
   ! ============================================================================
   ! CROSS SECTION RELATED CONSTANTS
diff --git a/src/geometry.F90 b/src/geometry.F90
index cc3ca0e5b1..64912cb954 100644
--- a/src/geometry.F90
+++ b/src/geometry.F90
@@ -1101,10 +1101,6 @@ contains
           ! If the distance was negative, set boundary distance to infinity
           if (d <= ZERO) d = INFINITY
 
-        case (SURF_GQ)
-          message = "Surface distance not yet implement for general quadratic."
-          call fatal_error()
-
         end select
 
         ! Check is calculated distance is new minimum
@@ -1235,19 +1231,12 @@ contains
 
     real(8) :: x,y,z    ! coordinates of particle
     real(8) :: func     ! surface function evaluated at point
-    real(8) :: A        ! coefficient on x**2 term in GQ
-    real(8) :: B        ! coefficient on y**2 term in GQ
-    real(8) :: C        ! coefficient on z**2 term in GQ
-    real(8) :: D        ! coefficient on x*y term in GQ
-    real(8) :: E        ! coefficient on y*z term in GQ
-    real(8) :: F        ! coefficient on x*z term in GQ
-    real(8) :: G        ! coefficient on x term in GQ
-    real(8) :: H        ! coefficient on y term in GQ
-    real(8) :: I        ! coefficient on z term in GQ
-    real(8) :: J        ! coefficient on constant term in GQ
+    real(8) :: A        ! coefficient on x for plane
+    real(8) :: B        ! coefficient on y for plane
+    real(8) :: C        ! coefficient on z for plane
+    real(8) :: D        ! coefficient for plane
     real(8) :: x0,y0,z0 ! coefficients for quadratic surfaces / box
     real(8) :: r        ! radius for quadratic surfaces
-    real(8) :: x1,y1,z1 ! upper-right corner of box
 
     x = p % coord % xyz(1)
     y = p % coord % xyz(2)
@@ -1337,71 +1326,6 @@ contains
       z = z - z0
       func = x*x + y*y - r*z*z
 
-    case (SURF_BOX_X)
-      y0 = surf % coeffs(1)
-      z0 = surf % coeffs(2)
-      y1 = surf % coeffs(3)
-      z1 = surf % coeffs(4)
-      if (y >= y0 .and. y < y1 .and. z >= z0 .and. z < z1) then
-        s = .false.
-      else
-        s = .true.
-      end if
-      return
-
-    case (SURF_BOX_Y)
-      x0 = surf % coeffs(1)
-      z0 = surf % coeffs(2)
-      x1 = surf % coeffs(3)
-      z1 = surf % coeffs(4)
-      if (x >= x0 .and. x < x1 .and. z >= z0 .and. z < z1) then
-        s = .false.
-      else
-        s = .true.
-      end if
-      return
-
-    case (SURF_BOX_Z)
-      x0 = surf % coeffs(1)
-      y0 = surf % coeffs(2)
-      x1 = surf % coeffs(3)
-      y1 = surf % coeffs(4)
-      if (x >= x0 .and. x < x1 .and. y >= y0 .and. y < y1) then
-        s = .false.
-      else
-        s = .true.
-      end if
-      return
-
-    case (SURF_BOX)
-      x0 = surf % coeffs(1)
-      y0 = surf % coeffs(2)
-      z0 = surf % coeffs(3)
-      x1 = surf % coeffs(4)
-      y1 = surf % coeffs(5)
-      z1 = surf % coeffs(6)
-      if (x >= x0 .and. x < x1 .and. y >= y0 .and. y < y1 .and. & 
-           z >= z0 .and. z < z1) then
-        s = .false.
-      else
-        s = .true.
-      end if
-      return
-
-    case (SURF_GQ)
-      A = surf % coeffs(1)
-      B = surf % coeffs(2)
-      C = surf % coeffs(3)
-      D = surf % coeffs(4)
-      E = surf % coeffs(5)
-      F = surf % coeffs(6)
-      G = surf % coeffs(7)
-      H = surf % coeffs(8)
-      I = surf % coeffs(9)
-      J = surf % coeffs(10)
-      func = A*x*x + B*y*y + C*z*z + D*x*y + E*y*z + F*x*z + G*x &
-           + H*y + I*z + J
-
     end select
 
     ! Check which side of surface the point is on
diff --git a/src/hdf5_interface.F90 b/src/hdf5_interface.F90
index 43b7a3ca7f..9237d6bac1 100644
--- a/src/hdf5_interface.F90
+++ b/src/hdf5_interface.F90
@@ -274,12 +274,6 @@ contains
         call h5ltmake_dataset_string_f(temp_group, "type", "Y Cone", hdf5_err)
       case (SURF_CONE_Z)
         call h5ltmake_dataset_string_f(temp_group, "type", "Z Cone", hdf5_err)
-      case (SURF_BOX_X)
-      case (SURF_BOX_Y)
-      case (SURF_BOX_Z)
-      case (SURF_BOX)
-      case (SURF_GQ)
-        call h5ltmake_dataset_string_f(temp_group, "type", "General Quadratic", hdf5_err)
       end select
 
       ! Write coefficients for surface
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 2d2482ba91..f6db74b9c4 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -803,21 +803,6 @@ contains
       case ('z-cone')
         s % type = SURF_CONE_Z
         coeffs_reqd  = 4
-      case ('box-x')
-        s % type = SURF_BOX_X
-        coeffs_reqd  = 4
-      case ('box-y')
-        s % type = SURF_BOX_Y
-        coeffs_reqd  = 4
-      case ('box-z')
-        s % type = SURF_BOX_Z
-        coeffs_reqd  = 4
-      case ('box') 
-        s % type = SURF_BOX
-        coeffs_reqd  = 6
-      case ('quadratic')
-        s % type = SURF_GQ
-        coeffs_reqd  = 10
       case default
         message = "Invalid surface type: " // trim(surface_(i) % type)
         call fatal_error()
diff --git a/src/output.F90 b/src/output.F90
index e95e7b8466..84a0a8dd40 100644
--- a/src/output.F90
+++ b/src/output.F90
@@ -537,12 +537,6 @@ contains
       string = "Y Cone"
     case (SURF_CONE_Z)
       string = "Z Cone"
-    case (SURF_BOX_X)
-    case (SURF_BOX_Y)
-    case (SURF_BOX_Z)
-    case (SURF_BOX)
-    case (SURF_GQ)
-      string = "General Quadratic"
     end select
     write(unit_,*) '    Type = ' // trim(string)