diff --git a/gds/user_proj_example.gds b/gds/user_proj_example.gds
deleted file mode 100644
index 6d760b7..0000000
--- a/gds/user_proj_example.gds
+++ /dev/null
Binary files differ
diff --git a/verilog/rtl/user_defines.v b/verilog/rtl/user_defines.v
index 6a83c25..87df507 100644
--- a/verilog/rtl/user_defines.v
+++ b/verilog/rtl/user_defines.v
@@ -20,7 +20,7 @@
 `define __USER_DEFINES_H
 
 // deliberately erroneous placeholder value; user required to config GPIO's to other
-`define GPIO_MODE_INVALID                  13'hXXXX
+//`define GPIO_MODE_INVALID                  10'hXXXX
 
 // Authoritive source of these MODE defs is: caravel/verilog/rtl/user_defines.v
 // Useful GPIO mode values.  These match the names used in defs.h.
@@ -49,41 +49,41 @@
 // up in a state that can be used immediately without depending on
 // the management SoC to run a startup program to configure the GPIOs.
 
-`define USER_CONFIG_GPIO_5_INIT  GPIO_MODE_USER_STD_BIDIRECTIONAL  // intr ack
-`define USER_CONFIG_GPIO_6_INIT  GPIO_MODE_USER_STD_BIDIRECTIONAL  // intr rq
-`define USER_CONFIG_GPIO_7_INIT  GPIO_MODE_USER_STD_BIDIRECTIONAL  // bus ack
-`define USER_CONFIG_GPIO_8_INIT  GPIO_MODE_USER_STD_BIDIRECTIONAL  // bus rq
-`define USER_CONFIG_GPIO_9_INIT  GPIO_MODE_USER_STD_BIDIRECTIONAL  // RDY
-`define USER_CONFIG_GPIO_10_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // WR
-`define USER_CONFIG_GPIO_11_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // RD
-`define USER_CONFIG_GPIO_12_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // STB0
-`define USER_CONFIG_GPIO_13_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // STB1
-`define USER_CONFIG_GPIO_14_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // DLE
+`define USER_CONFIG_GPIO_5_INIT  `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_6_INIT  `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_7_INIT  `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_8_INIT  `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_9_INIT  `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_10_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_11_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_12_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_13_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_14_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
 
 // Configurations of GPIO 15 to 25 are used on caravel but not caravan.
-`define USER_CONFIG_GPIO_15_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ALE
-`define USER_CONFIG_GPIO_16_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 0
-`define USER_CONFIG_GPIO_17_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 1
-`define USER_CONFIG_GPIO_18_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 2
-`define USER_CONFIG_GPIO_19_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 3
-`define USER_CONFIG_GPIO_20_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 4
-`define USER_CONFIG_GPIO_21_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 5
-`define USER_CONFIG_GPIO_22_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 6
-`define USER_CONFIG_GPIO_23_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 7
-`define USER_CONFIG_GPIO_24_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 8
-`define USER_CONFIG_GPIO_25_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 9
+`define USER_CONFIG_GPIO_15_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_16_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_17_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_18_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_19_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_20_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_21_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_22_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_23_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_24_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_25_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
 
-`define USER_CONFIG_GPIO_26_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 10
-`define USER_CONFIG_GPIO_27_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 11
-`define USER_CONFIG_GPIO_28_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 12
-`define USER_CONFIG_GPIO_29_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 13
-`define USER_CONFIG_GPIO_30_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 14
-`define USER_CONFIG_GPIO_31_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // ADBus 15
-`define USER_CONFIG_GPIO_32_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // mrst
-`define USER_CONFIG_GPIO_33_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // mclk
-`define USER_CONFIG_GPIO_34_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // NMI req
-`define USER_CONFIG_GPIO_35_INIT GPIO_MODE_USER_STD_BIDIRECTIONAL  // NMI ack
-`define USER_CONFIG_GPIO_36_INIT GPIO_MODE_USER_STD_INPUT_PULLDOWN // MODE0pin
-`define USER_CONFIG_GPIO_37_INIT GPIO_MODE_USER_STD_INPUT_PULLDOWN // MODE1pin
+`define USER_CONFIG_GPIO_26_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_27_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_28_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_29_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_30_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_31_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_32_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_33_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_34_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_35_INIT `GPIO_MODE_USER_STD_BIDIRECTIONAL
+`define USER_CONFIG_GPIO_36_INIT `GPIO_MODE_USER_STD_INPUT_PULLDOWN
+`define USER_CONFIG_GPIO_37_INIT `GPIO_MODE_USER_STD_INPUT_PULLDOWN
 
 `endif // __USER_DEFINES_H