Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r6d2e13dfca9285909eddd958ca82bf3da1157412 -r2c9f7442169ce34dd4a2fffe91e293efab255826
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6d2e13dfca9285909eddd958ca82bf3da1157412)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 2c9f7442169ce34dd4a2fffe91e293efab255826)
@@ -37,18 +37,8 @@
 #define VALVES_DATA_PUB_INTERVAL            ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Valves data publish interval.
 #define DATA_PUBLISH_COUNTER_START_COUNT    13                                                  ///< Valves data publish start counter.
 #define VALVE_TRANSITION_MIN_TGT_DELTA      50                                                  ///< Minimum encoder position delta from target position to end transition state.
-//#define VALVE_HOME_MIN_POS_CHG              3                                                   ///< Minimum encoder position change to indicate a home operation is still moving toward edge.
-//#define VALVE_HOME_BACK_OFF_EDGE            3                                                   ///< Encoder counts to back off of detected edge position.
-//#define MAX_HOME_FULL_TRAVEL_DIFF           10U                                                 ///< Maximum allowed difference in full travel encoder counts between expected and measured during home operation.
 #define VALVE_TRANSITION_TIMEOUT_MS         ( 3 * MS_PER_SECOND )                               ///< Valves transition time out in ms.
 #define VALVE_HOMING_TIMEOUT_MS             ( 15 * MS_PER_SECOND )                              ///< Valves homing time out in ms.
-//#define HOMING_EDGE_DETECTION_TIMEOUT_MS    ( 0.5 * MS_PER_SECOND )                             ///< Valves homing edge detection timeout in milliseconds.
-//#define VALVE_FORCE_HOME                    TRUE                                                ///< Force valve to home even if already homed.
-//#define ZERO_ENC_DEBOUNCE_THRESHOLD_CNT     5                                                   ///< Valves zero encoder debounce threshold count.
-//#define ZERO_ENC_DEBOUNCE_TIMEOUT_MS        ( 0.25 * MS_PER_SECOND )                            ///< Valves zero encoder debounce timeout in milliseconds.
-//#define VALVE_OFFEST_FROM_EDG_CNT           296                                                 ///< Valves offset from the edge.
-//#define POS_C_FROM_ZERO_CNT                 VALVE_OFFEST_FROM_EDG_CNT                           ///< Position C from zero position in counts.
-//#define POS_D_PARTIAL_CLOSE_FROM_ZERO_CNT   ( POS_C_FROM_ZERO_CNT + 32 )                        ///< Position D partial close from zero position in counts.
 
 /// Valve status structure
 typedef struct