diff --git a/celldrawer.cpp b/celldrawer.cpp
index fc2578fd..32121c48 100644
--- a/celldrawer.cpp
+++ b/celldrawer.cpp
@@ -1693,14 +1693,7 @@ void celldrawer::bookkeeping() {
   bool orig = false;
   if(!inmirrorcount) {
     transmatrix& gm = gmatrix[c];
-    orig = 
-      gm[LDIM][LDIM] == 0 ? true : 
-      euclid ? hdist0(tC0(gm)) >= hdist0(tC0(V)) :
-      in_e2xe() ? hdist0(tC0(gm)) >= hdist0(tC0(V)) :
-      (nil||sol) ? sqhypot_d(3, tC0(gm)) >= sqhypot_d(3, tC0(V)) :
-      sphereflipped() ? fabs(gm[LDIM][LDIM]-1) <= fabs(V[LDIM][LDIM]-1) :
-      fabs(gm[LDIM][LDIM]-1) >= fabs(V[LDIM][LDIM]-1) - 1e-8;
-
+    orig = (gm[LDIM][LDIM] == 0) || hdist0(tC0(gm)) >= hdist0(tC0(V));
     if(orig) gm = V;
     }
   if(just_gmatrix) return;