diff --git a/MicroDexed.ino b/MicroDexed.ino
index 475edd6..40ec269 100644
--- a/MicroDexed.ino
+++ b/MicroDexed.ino
@@ -638,9 +638,13 @@ void handleProgramChange(byte inChannel, byte inProgram)
 {
   if (inProgram < MAX_VOICES)
   {
+#ifdef DISPLAY_LCD_SPI
     change_disp_sd(false);
+#endif
     load_sysex(configuration.bank, inProgram);
+#ifdef DISPLAY_LCD_SPI
     change_disp_sd(true);
+#endif
   }
 }
 
diff --git a/UI.hpp b/UI.hpp
index 863c101..b3fab30 100644
--- a/UI.hpp
+++ b/UI.hpp
@@ -28,13 +28,6 @@
 
 #include "config.h"
 #include "Disp_Plus.h"
-/* #ifdef I2C_DISPLAY
-#include "LiquidCrystalPlus_I2C.h"
-#endif
-#ifdef U8X8_DISPLAY
-#include "SSD1322_Plus.h"
-#endif
- */
 #include <LCDMenuLib2.h>
 #include <Encoder.h>
 
@@ -70,7 +63,6 @@ elapsedMillis back_from_volume;
 
 #ifdef I2C_DISPLAY
 #include <LiquidCrystal_I2C.h>
-//LiquidCrystalPlus_I2C lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_rows);
 Disp_Plus<LiquidCrystal_I2C> lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_rows);
 #endif
 
@@ -82,7 +74,6 @@ Disp_Plus<LiquidCrystal_I2C> lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_
 #ifdef U8X8_HAVE_HW_I2C
 #include <Wire.h>
 #endif
-//SSD1322_Plus lcd(/* cs=*/ U8X8_CS_PIN, /* dc=*/ U8X8_DC_PIN, /* reset=*/ U8X8_RESET_PIN);
 Disp_Plus<U8X8_DISPLAY_CLASS> lcd(/* cs=*/ U8X8_CS_PIN, /* dc=*/ U8X8_DC_PIN, /* reset=*/ U8X8_RESET_PIN);
 //Disp_Plus<U8X8_DISPLAY_CLASS> lcd(U8X8_PIN_NONE);
 #endif