diff --git a/module_usb_audio/usb_buffer/usb_buffer.xc b/module_usb_audio/usb_buffer/usb_buffer.xc
index 4068b2a4..4d8d4bfe 100644
--- a/module_usb_audio/usb_buffer/usb_buffer.xc
+++ b/module_usb_audio/usb_buffer/usb_buffer.xc
@@ -65,9 +65,9 @@ unsigned char  gc_zero_buffer2[4];
 unsigned g_iap_reset = 1;
 unsigned g_iap_from_host_flag = 0;
 unsigned g_iap_to_host_flag = 0;
-int iap_to_host_usb_ep = 0;
-int iap_to_host_int_usb_ep = 0;
-int iap_from_host_usb_ep = 0;
+//int iap_to_host_usb_ep = 0;
+//int iap_to_host_int_usb_ep = 0;
+//int iap_from_host_usb_ep = 0;
 #endif
 
 unsigned char fb_clocks[16];
@@ -249,17 +249,7 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
 
 #ifdef IAP
     // get the two buffers to use for iap device->host
-    //asm("ldaw %0, dp[g_iap_to_host_buffer_A]":"=r"(iap_to_host_buffer));
-    //asm("ldaw %0, dp[g_iap_to_host_buffer_B]":"=r"(iap_to_host_waiting_buffer));
     asm("ldaw %0, dp[g_iap_from_host_buffer]":"=r"(iap_from_host_buffer));
-
-
-    // pass the iap->XUD chanends to decouple so that thread can
-    // initialize comm with XUD
-    asm("stw %0, dp[iap_to_host_usb_ep]"::"r"(ep_iap_to_host));
-    asm("stw %0, dp[iap_to_host_int_usb_ep]"::"r"(ep_iap_to_host_int));
-    asm("stw %0, dp[iap_from_host_usb_ep]"::"r"(ep_iap_from_host));    
-    SET_SHARED_GLOBAL(g_iap_from_host_flag, 1);    
 #endif
 
 #ifdef OUTPUT