diff --git a/src/Makefile b/src/Makefile
index 17a2cdac7c4fe41659fab6e1087bb23077d3cf9d..9740ca484e6bb116bd782aaa955220758661d2dd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ ASFLAGS	= -mcpu=arm920t -mapcs-32
 
 ARFLAGS = rcs
 
-LDFLAGS = -init main -Map bwio.map -N -T orex.ld -L/u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2 -L../lib
+LDFLAGS = -init main -Map main.map -N -T orex.ld -L/u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2 -L../lib
 
 all: main.elf
 
diff --git a/src/bwio.map b/src/bwio.map
deleted file mode 100644
index 5c23a14c0709a53dabef9f5c54fd2c228fffc60e..0000000000000000000000000000000000000000
--- a/src/bwio.map
+++ /dev/null
@@ -1,154 +0,0 @@
-Archive member included because of file (symbol)
-
-/u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
-                              bwio.o (__udivsi3)
-/u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
-                              bwio.o (__umodsi3)
-/u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)
-                              /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o) (__div0)
-
-Memory Configuration
-
-Name             Origin             Length             Attributes
-ram              0x0000000000000000 0x0000000002000000
-rom              0x0000000060000000 0x0000000000800000
-*default*        0x0000000000000000 0xffffffffffffffff
-
-Linker script and memory map
-
-
-data            0x0000000000000000        0x0
-                0x0000000000000000                _DataStart = .
- *(.data)
-                0x0000000000000000                _DataEnd = .
-
-bss             0x0000000000000000      0x3f4
-                0x0000000000000000                _BssStart = .
- *(.bss)
- .bss           0x0000000000000000        0x4 circular_buffer.o
-                0x0000000000000000                tail
- .bss           0x0000000000000004       0x78 pretty-print.o
- .bss           0x000000000000007c       0x1c sensors.o
- .bss           0x0000000000000098       0x5c switches.o
- .bss           0x00000000000000f4      0x288 trains.o
- .bss           0x000000000000037c       0x78 main.o
-                0x00000000000003f4                _BssEnd = .
-
-text            0x00000000000003f4     0x2364
- *(.text)
- .text          0x00000000000003f4      0xc54 bwio.o
-                0x000000000000076c                bwputr
-                0x0000000000000cd8                bwi2a
-                0x00000000000003f4                bwsetfifo
-                0x00000000000005c8                bwputc
-                0x0000000000000a28                bwa2d
-                0x00000000000004bc                bwsetspeed
-                0x000000000000068c                c2x
-                0x0000000000000ad0                bwa2i
-                0x0000000000000970                bwgetc
-                0x0000000000000b94                bwui2a
-                0x0000000000000d3c                bwformat
-                0x0000000000000868                bwputw
-                0x0000000000001010                bwprintf
-                0x00000000000006ec                bwputx
-                0x00000000000007ec                bwputstr
- .text          0x0000000000001048      0x4e4 io.o
-                0x000000000000121c                io_buffers_init
-                0x00000000000013cc                uart_receiving_ready
-                0x000000000000122c                uart_transmitting_ready
-                0x0000000000001110                io_set_speed
-                0x000000000000147c                uart_getc
-                0x0000000000001344                uart_putc
-                0x00000000000014f4                io_printf
-                0x0000000000001048                io_set_fifo
- .text          0x000000000000152c      0x78c pretty-print.o
-                0x00000000000017e0                pp_main_display
-                0x000000000000152c                pp_prompt
-                0x0000000000001674                pp_sensors
-                0x0000000000001c78                pp_train_num
-                0x0000000000001a38                pp_time
-                0x0000000000001560                pp_switches
- .text          0x0000000000001cb8       0x94 sensors.o
-                0x0000000000001cb8                sensors_init
-                0x0000000000001ce8                sensors_update
- .text          0x0000000000001d4c       0xd8 switches.o
-                0x0000000000001d4c                switches_init
-                0x0000000000001da8                sw
- .text          0x0000000000001e24       0xa0 timer.o
-                0x0000000000001e8c                timer_get_time
-                0x0000000000001e24                timer_init
- .text          0x0000000000001ec4      0x13c trains.o
-                0x0000000000001eec                train_run
-                0x0000000000001fcc                train_switch
-                0x0000000000001ed4                train_stop
-                0x0000000000001ff0                train_quit
-                0x0000000000001ec4                trains_init
-                0x0000000000001f7c                train_reverse
- .text          0x0000000000002000       0xb4 main.o
-                0x0000000000002000                main
- .text          0x00000000000020b4      0x110 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
-                0x00000000000020b4                __udivsi3
-                0x00000000000021ac                __aeabi_uidivmod
- .text          0x00000000000021c4       0xcc /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
-                0x00000000000021c4                __umodsi3
- .text          0x0000000000002290        0x4 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)
-                0x0000000000002290                __aeabi_ldiv0
-                0x0000000000002290                __div0
-                0x0000000000002290                __aeabi_idiv0
- *(.got)
- .got           0x0000000000002294       0x1c pretty-print.o
- *(.got.plt)
- .got.plt       0x00000000000022b0        0xc pretty-print.o
-                0x00000000000022b0                _GLOBAL_OFFSET_TABLE_
- *(.rodata)
- .rodata        0x00000000000022bc      0x490 pretty-print.o
- .rodata        0x000000000000274c        0xc main.o
- *(.glue_7)
- *(.glue_7t)
-
-.rel.dyn
-LOAD bwio.o
-LOAD circular_buffer.o
-LOAD io.o
-LOAD pretty-print.o
-LOAD sensors.o
-LOAD switches.o
-LOAD timer.o
-LOAD trains.o
-LOAD main.o
-LOAD /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a
-OUTPUT(main.elf elf32-littlearm)
-
-.comment        0x0000000000000000       0xa2
- .comment       0x0000000000000000       0x12 bwio.o
- .comment       0x0000000000000012       0x12 circular_buffer.o
- .comment       0x0000000000000024       0x12 io.o
- .comment       0x0000000000000036       0x12 pretty-print.o
- .comment       0x0000000000000048       0x12 sensors.o
- .comment       0x000000000000005a       0x12 switches.o
- .comment       0x000000000000006c       0x12 timer.o
- .comment       0x000000000000007e       0x12 trains.o
- .comment       0x0000000000000090       0x12 main.o
-
-.debug_line     0x0000000000000000      0x14f
- .debug_line    0x0000000000000000       0x86 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
- .debug_line    0x0000000000000086       0x6f /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
- .debug_line    0x00000000000000f5       0x5a /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)
-
-.debug_info     0x0000000000000000      0x153
- .debug_info    0x0000000000000000       0x71 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
- .debug_info    0x0000000000000071       0x71 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
- .debug_info    0x00000000000000e2       0x71 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)
-
-.debug_abbrev   0x0000000000000000       0x3c
- .debug_abbrev  0x0000000000000000       0x14 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
- .debug_abbrev  0x0000000000000014       0x14 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
- .debug_abbrev  0x0000000000000028       0x14 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)
-
-.debug_aranges  0x0000000000000000       0x60
- .debug_aranges
-                0x0000000000000000       0x20 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_udivsi3.o)
- .debug_aranges
-                0x0000000000000020       0x20 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_umodsi3.o)
- .debug_aranges
-                0x0000000000000040       0x20 /u/wbcowan/gnuarm-4.0.2/lib/gcc/arm-elf/4.0.2/libgcc.a(_dvmd_tls.o)