Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -rf66ffb2807dae4ad719d41520bc8c3739210bfd0 -rb9a6c61d168d8aad9314f05b749645c73158b621
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision f66ffb2807dae4ad719d41520bc8c3739210bfd0)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision b9a6c61d168d8aad9314f05b749645c73158b621)
@@ -71,6 +71,9 @@
 static void publishLevelsData( void );
 static BOOL processLevelCount( U16 count );
 static LEVEL_STATE_T readFloaterLevelstatus( LEVEL_T levelId );
+static LEVEL_STATE_T getLevelState( U32 levelStatus );
+static LEVEL_STATE_T getLevelStateBeta19( U32 levelStatus );
+static LEVEL_STATE_T getLevelStateBeta10( U32 levelStatus );
 
 /*********************************************************************//**
  * @brief
@@ -319,14 +322,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getLevelStateBeta20 function maps the raw floater/level status reported
+ * The getLevelState function maps the raw floater/level status reported
  * by FPGA to the corresponding LEVEL_STATE_T for Beta 2.0 hardware.
  * @details \b Inputs: levelStatus
  * @details \b Outputs: none
  * @param levelStatus Raw FPGA level status value
  * @return mapped level state
  *************************************************************************/
-static LEVEL_STATE_T getLevelStateBeta20( U32 levelStatus )
+static LEVEL_STATE_T getLevelState( U32 levelStatus )
 {
     LEVEL_STATE_T currentLevelStatus = LEVEL_STATE_ILLEGAL;
 
@@ -415,7 +418,7 @@
        else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
        {
            // Beta 2.0 behavior
-           currentLevelStatus = getLevelStateBeta20( levelStatus );
+           currentLevelStatus = getLevelState( levelStatus );
        }
        else
        {
@@ -437,7 +440,7 @@
        else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
       {
           // Beta 2.0 behavior
-          currentLevelStatus = getLevelStateBeta20( levelStatus );
+          currentLevelStatus = getLevelState( levelStatus );
       }
        else
        {
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rbe3fa274cd01b6dec1f98fa7266739b55648d582 -rb9a6c61d168d8aad9314f05b749645c73158b621
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision be3fa274cd01b6dec1f98fa7266739b55648d582)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision b9a6c61d168d8aad9314f05b749645c73158b621)
@@ -450,7 +450,7 @@
     U08 fpgaP18CalMemCounter;                   ///< Reg 820. TBD
 } DD_FPGA_SENSORS_T;
 
-#if 1    // TODO: Remove when Beta 1.9 is obsolete
+// Remove when Beta 1.9 is obsolete
 typedef struct
 {
     U16 fpgaValveControl;                       ///< Reg 04. Valve control register
@@ -529,7 +529,6 @@
     U16 fpgaConSensD43_Addrs;                   ///< Reg 119. D43 Initialization Address register
     U32 fpgaConSensD43_Data_In;                 ///< Reg 121. D43 Initialization data register
 } FPGA_ACTUATORS_BETA_1_9_T;
-#endif
 
 typedef struct
 {