diff --git a/PiZero.scad b/PiZero.scad
index afdc8d3..2232e62 100644
--- a/PiZero.scad
+++ b/PiZero.scad
@@ -8,15 +8,11 @@
 PiZeroVer = "W";        // [1.2/1.3/W/WH] for version of Pi
 
 // visibility options
-// ShowPiZero = true;
 ShowPiZero = false;
-ShowTestPads = true;
-//ShowTestPads = false;
+ShowTestPads = false;
 ShowGPIOheader = 0;     // 0 = dont' show, 1 = show above, -1 = show below (version WH overrides this)
-ShowGPIOsound = true;
-//ShowGPIOsound = false;
-ShowGPIOcolour = true;
-//ShowGPIOcolour = false;
+ShowGPIOsound = false;
+ShowGPIOcolour = false;
 
 //
 // Loads of variables
@@ -121,8 +117,7 @@ if(ShowPiZero) PiZeroBody();
 if (ShowTestPads) PiZeroTestPads();
     
 // Model the GPIO headers if required (always show for WH)
-if (PiZeroVer=="WH") PiGPIO(1);
-	else if (ShowGPIOheader) PiGPIO(ShowGPIOheader);
+//PiGPIO(ShowGPIOheader);
 
 
 /*
diff --git a/pi-camera-case.scad b/pi-camera-case.scad
index d777699..47e9f1e 100644
--- a/pi-camera-case.scad
+++ b/pi-camera-case.scad
@@ -7,7 +7,7 @@ case_height = 7;
 outer_rect_size=[PiSizeX + wall_thickness_mod, PiSizeY + wall_thickness_mod];
 PiZeroVer = "WH";
 
-up(cap_thickness) PiZeroBody(false);
+%up(cap_thickness) PiZeroBody(false);
 union() {
   // Case Walls
 	up(cap_thickness - 0.05) difference() {