diff --git a/module_queue/module_build_info b/module_queue/module_build_info
index 5082786c..fb146b9d 100644
--- a/module_queue/module_build_info
+++ b/module_queue/module_build_info
@@ -11,4 +11,4 @@
 
 MODULE_XCC_XC_FLAGS = $(XCC_XC_FLAGS)
 
-DEPENDENT_MODULES = lib_xassert
+DEPENDENT_MODULES = 
diff --git a/module_queue/src/queue.h b/module_queue/src/queue.h
index 39b57728..1d120fc8 100644
--- a/module_queue/src/queue.h
+++ b/module_queue/src/queue.h
@@ -1,7 +1,7 @@
 #ifndef QUEUE_H_
 #define QUEUE_H_
 
-#include <xassert.h>
+#define assert(x) asm("ecallf %0"::"r"(x));
 
 typedef struct queue_t {
     /// Read index.
diff --git a/module_usb_midi/src/midiinparse.xc b/module_usb_midi/src/midiinparse.xc
index 020f9b61..913b5b54 100644
--- a/module_usb_midi/src/midiinparse.xc
+++ b/module_usb_midi/src/midiinparse.xc
@@ -2,11 +2,9 @@
  * @file midiinparse.xc
  * @brief Generates USB MIDI events from MIDI events
  * @author Russell Gallop, XMOS Semiconductor
- * @version 0.1
  */
 
 #include <print.h>
-//#include <assert.h>
 #include "midiinparse.h"
 
 /**
@@ -14,13 +12,13 @@
  *
  */
 void dump_midi_in_parse_state(struct midi_in_parse_state &s) {
-   printstr("expect_msg_len: 0x"); printhexln(s.expect_msg_len);
-   printstr("msg_type: 0x"); printhexln(s.msg_type);
-   printstr("receivebuffer: 0x"); printhex(s.receivebuffer[0]);
-      printstr(", 0x"); printhex(s.receivebuffer[1]);
-      printstr(", 0x"); printhexln(s.receivebuffer[2]);
-   printstr("received: 0x"); printhexln(s.received);
-   printstr("codeIndexNumber: 0x"); printhexln(s.codeIndexNumber);
+    printstr("expect_msg_len: 0x"); printhexln(s.expect_msg_len);
+    printstr("msg_type: 0x"); printhexln(s.msg_type);
+    printstr("receivebuffer: 0x"); printhex(s.receivebuffer[0]);
+    printstr(", 0x"); printhex(s.receivebuffer[1]);
+    printstr(", 0x"); printhexln(s.receivebuffer[2]);
+    printstr("received: 0x"); printhexln(s.received);
+    printstr("codeIndexNumber: 0x"); printhexln(s.codeIndexNumber);
 }
 
 /**