Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision bd896114f304304a7096b30b2a85067a64645e82)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799)
@@ -22,9 +22,7 @@
 
 #include "AlarmMgmtDD.h"
 #include "Comm.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
 #include "ConductivityTeensy.h"
-#endif
 #include "FPGA.h"
 #include "Interrupts.h"
 #include "SystemCommDD.h"
@@ -240,7 +238,7 @@
                 clearSCI2DMATransmitInterrupt();
                 signalFPGATransmitCompleted();
                 break;
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+
             case DMA_CH1:  // Conductivity receive channel
                 clearSCIDMAReceiveInterrupt();
                 signalConductivityReceiptCompleted();
@@ -249,8 +247,8 @@
             case DMA_CH3:  // Conductivity transmit channel
                 clearSCIDMATransmitInterrupt();
                 signalConductivityTransmitCompleted();
-                break;
-#endif
+                break;
+
             default:
                 // TODO - ignore?
                 break;