diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
index d74afcad2..c577c9a19 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Collect2dTargetsPipe.java
@@ -47,10 +47,6 @@ public class Collect2dTargetsPipe implements Pipe<Pair<List<RotatedRect>, Captur
                 t.rawPoint = r;
                 switch (this.calibrationMode) {
                     case Single:
-                        if (this.calibrationPoint.get(0) == null)
-                            this.calibrationPoint.set(0, camProps.centerX);
-                        if (this.calibrationPoint.get(1) == null)
-                            this.calibrationPoint.set(1, camProps.centerY);
                         t.calibratedX = this.calibrationPoint.get(0).doubleValue();
                         t.calibratedY = this.calibrationPoint.get(1).doubleValue();
                         break;
diff --git a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
index 507af3cf7..367799717 100644
--- a/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
+++ b/chameleon-server/src/main/java/com/chameleonvision/vision/pipeline/pipes/Draw2dCrosshairPipe.java
@@ -49,10 +49,6 @@ public class Draw2dCrosshairPipe implements Pipe<Pair<Mat, List<CVPipeline2d.Tar
             y = image.rows() / 2;
             switch (this.calibrationMode) {
                 case Single:
-                    if (this.calibrationPoint.get(0) == null)
-                        this.calibrationPoint.set(0, image.cols()/2);
-                    if (this.calibrationPoint.get(1) == null)
-                        this.calibrationPoint.set(1, image.rows()/2);
                     x = this.calibrationPoint.get(0).intValue();
                     y = this.calibrationPoint.get(1).intValue();
                     break;