Index: Common.h
===================================================================
diff -u -r9a022c4969d0e12d9c94d4d89232e1581584319e -r69026a5e09f0adb43b19b41eee993dd1d68b5b75
--- Common.h	(.../Common.h)	(revision 9a022c4969d0e12d9c94d4d89232e1581584319e)
+++ Common.h	(.../Common.h)	(revision 69026a5e09f0adb43b19b41eee993dd1d68b5b75)
@@ -59,12 +59,12 @@
     NUM_OF_SELF_TEST_STATUS                         ///< Number of self-test status
 } SELF_TEST_STATUS_T;
 
-/// List of 2-way valve states.
+/// List of 2-way states.
 typedef enum Two_Way_States
 {
-    STATE_CLOSED = 0,                               ///< Valve is closed state
-    STATE_OPEN,                                     ///< Valve is open state
-    NUM_OF_OPN_CLS_STATES                           ///< Number of 2-way valve states
+    STATE_CLOSED = 0,                               ///< Closed state
+    STATE_OPEN,                                     ///< Open state
+    NUM_OF_OPN_CLS_STATES                           ///< Number of 2-way states
 } OPN_CLS_STATE_T;
 
 /// List of motor directions.
@@ -80,17 +80,9 @@
 {
     PUMP_CONTROL_MODE_CLOSED_LOOP = 0,               ///< Pump controlled based on set point and feedback
     PUMP_CONTROL_MODE_OPEN_LOOP,                     ///< Pump controlled to set PWM duty cycle
-    PUMP_CONTROL_MODE_NONE,                          ///< Pump control mode none
     NUM_OF_PUMP_CONTROL_MODES                        ///< Number of pump control modes
 } PUMP_CONTROL_MODE_T;
 
-/// List of switch states.
-typedef enum Switch_States
-{
-    TURN_OFF = 0,                                   ///< Turn off
-    TURN_ON,                                        ///< Turn on
-} SWITCH_STATES_T;
-
 // **** Common Definitions ****
 
 #define NEARLY_ZERO                     0.00000001  ///< Value that is nearly zero.  Used for floating point zero comparisons (e.g. divide by zero checks)
Index: NVDataMgmt.c
===================================================================
diff -u -r14434061a23aa02218e1f3c6cc3024123e79b153 -r69026a5e09f0adb43b19b41eee993dd1d68b5b75
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 14434061a23aa02218e1f3c6cc3024123e79b153)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 69026a5e09f0adb43b19b41eee993dd1d68b5b75)
@@ -808,8 +808,7 @@
  * Dialin
  * @param totalMessages: total number of messages from Dialin
  * @param length: message length in bytes
- * @param *addressPtr: address to the beginning of the calibration data from
- * Dialin
+ * @param *addressPtr: address to the beginning of the calibration data from Dialin
  * @return TRUE if the request was successfully registered
  *************************************************************************/
 BOOL setCalibrationRecord( U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr )