diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index f8e1085f..6e2006b2 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -987,20 +987,10 @@ DrawingPanel::DrawingPanel(int _width, int _height) :
     memset(delta, 0xff, sizeof(delta));
 
     scale = builtin_ff_scale(gopts.filter);
-#ifndef NO_ASM
-    // while there is a 32->16 frontend for these, it's probably more
-    // efficient to just use 16 to start with
-    // unfortunately, this also means that the 32-bit output needs to
-    // be sensed in lower code
-    if(gopts.filter == FF_HQ3X || gopts.filter == FF_HQ4X)
-        systemColorDepth = 16;
-    else
-#endif
 #define out_16 (systemColorDepth == 16)
     systemColorDepth = 32;
 
     // Intialize color tables
-    if(systemColorDepth == 32) {
 #if wxBYTE_ORDER == wxLITTLE_ENDIAN
 	systemRedShift    = 3;
 	systemGreenShift  = 11;
@@ -1012,14 +1002,6 @@ DrawingPanel::DrawingPanel(int _width, int _height) :
 	systemBlueShift   = 11;
 	RGB_LOW_BITS_MASK = 0x01010100;
 #endif
-    } else {
-	// plugins expect RGB in native byte order
-	systemRedShift    = 10;
-	systemGreenShift  = 5;
-	systemBlueShift   = 0;
-	RGB_LOW_BITS_MASK = 0x0421;
-    }
-
     // FIXME: should be "true" for GBA carts if lcd mode selected
     // which means this needs to be re-run at pref change time
     utilUpdateSystemColorMaps(false);