diff --git a/src/propeller/genome.cljc b/src/propeller/genome.cljc
index cb18903..db8f430 100755
--- a/src/propeller/genome.cljc
+++ b/src/propeller/genome.cljc
@@ -48,8 +48,7 @@ They hold the genetic material for an `individual`. In the initial population, w
    (plushy->push plushy {}))
   ;; call plushy->push-internal with possibly-preprocessed plushy
   ([plushy argmap]
-   (plushy->push-internal (if (or (> (or (:bmx (:variation argmap)) 0) 0) ;; must strip :gap
-                                  (> (or (:bmx-umad (:variation argmap)) 0) 0)) ;; must strip :gap
+   (plushy->push-internal (if (:bmx? argmap)
                             (filter (complement #{:gap}) plushy)
                             plushy)
                           argmap)))
\ No newline at end of file
diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc
index 18576d7..0413836 100644
--- a/src/propeller/gp.cljc
+++ b/src/propeller/gp.cljc
@@ -36,8 +36,7 @@
        :behavioral-diversity  (float (/ (count (distinct (map :behaviors pop))) (count pop)))
        :average-genome-length (float (/ (reduce + (map count (map :plushy pop))) (count pop)))
        :average-total-error   (float (/ (reduce + (map :total-error pop)) (count pop)))}
-      (if (or (> (or (:bmx (:variation argmap)) 0) 0)       ; using bmx
-              (> (or (:bmx-umad (:variation argmap)) 0) 0)) ; using bmx-umad
+      (if (:bmx? argmap)
         {:best-gene-count     (utils/count-genes (:plushy best))
          :average-gene-count  (float (/ (reduce + (map utils/count-genes (map :plushy pop)))
                                         (count pop)))}
@@ -173,4 +172,3 @@
                                                               (count indexed-training-data)))
                          indexed-training-data)
                        indexed-training-data))))))
-