diff --git a/nanovna.h b/nanovna.h
index 5b3a5da..e5c6b97 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-#ifdef TINYSA_F303
+//#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-#endif
+//#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303
diff --git a/sa_core.c b/sa_core.c
index 10d1ec8..e161940 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -360,10 +360,7 @@ void set_output_path(freq_t f, float level)
     goto common;
 
   case PATH_DIRECT:
-    if (max2871)
-      enable_ultra(false);
-    else
-      enable_ultra(true);
+    enable_ultra(true);
     enable_direct(true);
     enable_high(true);
     enable_ADF_output(false, false);
@@ -417,13 +414,8 @@ void set_input_path(freq_t f)
     goto common;
 
   case PATH_DIRECT:
-    if (max2871) {
-      enable_ultra(false);
-      enable_direct(true);
-    } else {
-      enable_ultra(true);
-      enable_direct(true);
-    }
+    enable_ultra(true);
+    enable_direct(true);
     enable_high(true);
     enable_extra_lna(setting.extra_lna);
     if (setting.tracking_output)
@@ -436,13 +428,8 @@ void set_input_path(freq_t f)
   case PATH_ULTRA:
     enable_ultra(true);
     enable_high(false);
-    if (max2871) {
-      enable_direct(setting.extra_lna);     // Acts as LNA switch in Ultra mode.
-      enable_extra_lna(false);
-    } else {
-      enable_direct(false);
-      enable_extra_lna(setting.extra_lna);
-    }
+    enable_direct(false);
+    enable_extra_lna(setting.extra_lna);
     common:
     enable_ADF_output(true, setting.tracking_output);
     common2:
diff --git a/si4468.c b/si4468.c
index 6ec2f23..3098d91 100644
--- a/si4468.c
+++ b/si4468.c
@@ -2659,8 +2659,6 @@ static int old_ultra = 2;
   if (s != old_ultra) {
     old_ultra = s;
 #ifdef TINYSA4
-    if (max2871)
-      s = !s;
     if (s)
       palClearLine(LINE_ULTRA);
     else
@@ -2716,8 +2714,6 @@ void enable_direct(int s)
   if (s == old_direct)
     return;
   old_direct = s;
-  if (max2871)
-    s = !s;
   if (s)
     SI4463_set_gpio(4,SI446X_GPIO_MODE_DRIVE0);
   else