diff --git a/CommandStation-EX.ino b/CommandStation-EX.ino
deleted file mode 100644
index 1026fe4..0000000
--- a/CommandStation-EX.ino
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *  main.cpp
- * 
- *  This file is part of CommandStation-DCC.
- *
- *  CommandStation-DCC is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CommandStation-DCC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation-DCC.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <Arduino.h>
-#include <DCC-EX-Lib.h>
-#include <ArduinoTimers.h>
-
-#include "Config.h"
-#include "FreeMemory.h"
-
-#if defined(ARDUINO_ARCH_AVR)
-int ramLowWatermark = 32767;
-#else
-int ramLowWatermark = 256000;
-#endif
-
-const uint8_t kIRQmicros = 29;
-const uint8_t kNumLocos = 50;
-
-Railcom* mainRailcom;
-
-#if defined CONFIG_ARDUINO_MOTOR_SHIELD
-BoardArduinoMotorShield* mainBoard;
-BoardArduinoMotorShield* progBoard;
-#elif defined CONFIG_POLOLU_MOTOR_SHIELD
-BoardPololuMotorShield* mainBoard;
-BoardPololuMotorShield* progBoard;
-#else
-#error "Cannot compile - no board selected in Config.h"
-#endif
-
-DCCMain* mainTrack;
-DCCService* progTrack;
-
-void waveform_IrqHandler() {
-  bool mainInterrupt = mainTrack->interrupt1();
-  bool progInterrupt = progTrack->interrupt1();
-  if(mainInterrupt) mainTrack->interrupt2();
-  if(progInterrupt) progTrack->interrupt2();
-}
-
-#if defined(ARDUINO_ARCH_SAMD)
-void SERCOM4_Handler()
-{   
-  mainTrack->railcom->getSerial()->IrqHandler();
-}
-#elif defined(ARDUINO_ARCH_SAMC)
-void SERCOM0_Handler()
-{   
-  mainTrack->railcom->getSerial()->IrqHandler();
-}
-#endif
-
-void setup() {
-  
-
-#if defined CONFIG_ARDUINO_MOTOR_SHIELD
-  BoardConfigArduinoMotorShield mainConfig;
-  BoardArduinoMotorShield::getDefaultConfigA(mainConfig);
-  mainConfig.track_power_callback = DCCEXParser::trackPowerCallback;
-  // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax
-
-  //
-  mainBoard = new BoardArduinoMotorShield(mainConfig);
-
-  BoardConfigArduinoMotorShield progConfig;
-  BoardArduinoMotorShield::getDefaultConfigB(progConfig);
-  progConfig.track_power_callback = DCCEXParser::trackPowerCallback;
-  // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax
-
-  //
-  progBoard = new BoardArduinoMotorShield(progConfig);
-#elif defined CONFIG_POLOLU_MOTOR_SHIELD
-  BoardConfigPololuMotorShield mainConfig;
-  BoardPololuMotorShield::getDefaultConfigA(mainConfig);
-  mainConfig.track_power_callback = DCCEXParser::trackPowerCallback;
-  // Add modifications to pinouts, currents, etc here using mainConfig.setting = value; syntax
-
-  //
-  mainBoard = new BoardPololuMotorShield(mainConfig);
-
-  BoardConfigPololuMotorShield progConfig;
-  BoardPololuMotorShield::getDefaultConfigB(progConfig);
-  progConfig.track_power_callback = DCCEXParser::trackPowerCallback;
-  // Add modifications to pinouts, currents, etc here using progConfig.setting = value; syntax
-
-  //
-  progBoard = new BoardPololuMotorShield(progConfig);
-#endif
-
-  RailComConfig rcomConfig;
-  Railcom::getDefaultConfig(rcomConfig);  // Default is off
-  mainRailcom = new Railcom(rcomConfig);
-
-  mainBoard->setup();
-  mainTrack = new DCCMain(kNumLocos, mainBoard, mainRailcom);
-  mainTrack->setup();
-  
-  progBoard->setup();
-  progTrack = new DCCService(progBoard);
-  progTrack->setup(); // Currently doesn't do anything, but may be extended later
-  progTrack->board->progMode(ON);   // Limits current to 250mA. Current limit can be changed in config above.
-
-  // TimerA is TCC0 on SAMD21, Timer1 on MEGA2560, and Timer1 on MEGA328
-  // We will fire an interrupt every 29us to generate the signal on the track 
-  TimerA.initialize();
-  TimerA.setPeriod(kIRQmicros);
-  TimerA.attachInterrupt(waveform_IrqHandler);
-  TimerA.start();
-
-  // Register the serial interface
-#if defined (ARDUINO_ARCH_SAMD)
-  CommManager::registerInterface(new USBInterface(SerialUSB));
-  while(!SerialUSB) {}
-  Wire.begin();       // Needed for EEPROM to work
-  EEStore::init(&SerialUSB);
-#elif defined (ARDUINO_ARCH_SAMC)
-  CommManager::registerInterface(new SerialInterface(Serial));
-  Wire.begin();       // Needed for EEPROM to work
-  EEStore::init(&Serial);
-#elif defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR)
-  CommManager::registerInterface(new SerialInterface(Serial));
-  EEStore::init(&Serial);
-#endif
-
-  // Set up the string parser to accept commands from the interfaces
-  DCCEXParser::init(mainTrack, progTrack);       
-
-  CommManager::showInitInfo();           
-}
-
-void loop() {
-  CommManager::update();
-  mainTrack->loop();
-  progTrack->loop();
-
-#if defined(FREE_MEM_PRINT)
-  int freeNow=freeMemory();
-  if (freeNow<ramLowWatermark) {
-    ramLowWatermark=freeNow;
-    CommManager::broadcast(F("\n\rFree RAM=%d\n\r"),ramLowWatermark);
-  }
-#endif
-}
diff --git a/Config.h b/Config.h
deleted file mode 100644
index fb5e670..0000000
--- a/Config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Config.h
- * 
- *  This file is part of CommandStation-DCC.
- *
- *  CommandStation-DCC is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  CommandStation-DCC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation-DCC.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef COMMANDSTATION_DCC_CONFIG_H_
-#define COMMANDSTATION_DCC_CONFIG_H_
-
-// Choose the motor shield that you want to use.
-
-//#define CONFIG_WSM_FIREBOX_MK1
-//#define CONFIG_WSM_FIREBOX_MK1S
-#define CONFIG_ARDUINO_MOTOR_SHIELD
-//#define CONFIG_POLOLU_MOTOR_SHIELD
-
-// Comment out this line to disable printing free memory every time it shrinks
-#define FREE_MEM_PRINT
-
-#endif  // COMMANDSTATION_DCC_CONFIG_H_
diff --git a/FreeMemory.h b/FreeMemory.h
deleted file mode 100644
index 25d3d65..0000000
--- a/FreeMemory.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef COMMANDSTATION_DCC_FREEMEMORY_H_
-#define COMMANDSTATION_DCC_FREEMEMORY_H_
-
-// thanks go to  https://github.com/mpflaga/Arduino-MemoryFree
-#ifdef __arm__
-// should use uinstd.h to define sbrk but Due causes a conflict
-extern "C" char* sbrk(int incr);
-#else
-extern char *__brkval;
-#endif  // __arm__
-
-int freeMemory() {
-  char top;
-#ifdef __arm__
-  return &top - reinterpret_cast<char*>(sbrk(0));
-#else
-  return __brkval ? &top - __brkval : &top - __malloc_heap_start;
-#endif  // __arm__
-}
-#endif  // COMMANDSTATION_DCC_FREEMEMORY_H_
\ No newline at end of file