diff --git a/module_dfu/module_build_info b/module_dfu/module_build_info
index be27f1e8..67c1a3c2 100644
--- a/module_dfu/module_build_info
+++ b/module_dfu/module_build_info
@@ -23,14 +23,8 @@ INCLUDE_DIRS += $(MODULE_DIRS)
 #
 # $(call SET_XCC_C_FLAGS, mydir1 mydir2, $(XCC_FLAGS) -g -O3)
 
-ifeq ($(ARCH_G),)
-ARCH_FLAG = -D ARCH_L
-else
-ARCH_FLAG = -D ARCH_G
-endif
-
-$(call SET_XCC_C_FLAGS, $(MODULE_DIRS) $(XCC_FLAGS) $(ARCH_FLAG) -g -O3)
-$(call SET_XCC_XC_FLAGS, $(MODULE_DIRS), $(XCC_FLAGS) $(ARCH_FLAG) -fsubword-select -g -O3)
+$(call SET_XCC_C_FLAGS, $(MODULE_DIRS) $(XCC_FLAGS) -g -O3)
+$(call SET_XCC_XC_FLAGS, $(MODULE_DIRS), $(XCC_FLAGS) -fsubword-select -g -O3)
 
 # You can change the flags of an individual file by setting the 
 # XCC_FLAGS_[filename] variable. e.g.
diff --git a/module_dfu/src/dfu.xc b/module_dfu/src/dfu.xc
index 50f93a23..f3eae2af 100644
--- a/module_dfu/src/dfu.xc
+++ b/module_dfu/src/dfu.xc
@@ -458,20 +458,11 @@ int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, ch
 
     if (sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H && sp.wLength != 0)
     {
-        // Device to host
-#ifdef ARCH_G
-        XUD_DoGetRequest(ep0_out, 0, (data_buffer, unsigned char[]), return_data_len, return_data_len);
-#else
         XUD_DoGetRequest(ep0_out, ep0_in, (data_buffer, unsigned char[]), return_data_len, return_data_len);
-#endif
     }
     else
     {
-#ifdef ARCH_G
-        XUD_DoSetRequestStatus(ep0_out);
-#else
         XUD_DoSetRequestStatus(ep0_in);
-#endif
     }
 
   	// If device reset requested, handle after command acknowledgement
diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index d0beabfd..32be8645 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -127,7 +127,7 @@ on tile[AUDIO_IO_TILE] :  buffered port:1 p_midi_rx         = PORT_MIDI_IN;
 
 /* Clock blocks */
 #ifdef MIDI 
-#if defined (ARCH_L) && (AUDIO_IO_TILE == XUD_TILE)
+#if (XUD_SERIES_SUPPORT == XUD_L_SERIES) && (AUDIO_IO_TILE == XUD_TILE)
 /* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI
  * if MIDI and XUD on same tile. See XUD documentation. 
  *
@@ -153,8 +153,8 @@ on tile[AUDIO_IO_TILE] : clock    clk_audio_bclk            = XS1_CLKBLK_3;
 on tile[AUDIO_IO_TILE] : clock    clk_mst_spd               = XS1_CLKBLK_1;
 #endif
 
-/* L Series needs a port to use for USB reset */
-#if (defined(ARCH_L) || defined(ARCH_G)) && defined(PORT_USB_RESET)
+/* L/G Series needs a port to use for USB reset */
+#if (XUD_SERIES_SUPPORT != XUD_U_SERIES) && defined(PORT_USB_RESET)
 /* This define is checked since it could be on a shift reg or similar */
 on tile[XUD_TILE] : out port p_usb_rst                      = PORT_USB_RESET;
 #else
@@ -162,7 +162,7 @@ on tile[XUD_TILE] : out port p_usb_rst                      = PORT_USB_RESET;
 #define p_usb_rst   null
 #endif
 
-#if defined (ARCH_L) || defined(ARCH_G)
+#if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
 /* L Series also needs a clock for this port */
 on tile[XUD_TILE] : clock clk                               = XS1_CLKBLK_4;
 #else