diff --git a/firmware/src/board/hvdin.cpp b/firmware/src/board/hvdin.cpp
deleted file mode 100644
index 8757efd..0000000
--- a/firmware/src/board/hvdin.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/**** Includes ****/
-#include "../utils/utils.h"
-#include "mcu/mcu_hal.h"
-#include "hvdin.h"
-
-using namespace board;
-
-/**** Private definitions ****/
-/**** Private constants ****/
-/**** Private variables ****/
-/**** Private function declarations ****/
-
-/**** Public function definitions ****/
-board::HVDigitalIn::HVDigitalIn(uint8_t gpio_ch, uint8_t init_read)
-{
-	this->gpio_ch = gpio_ch;
-	
-	if(init_read) this->last_read = HVDIN_HIGH;
-	else this->last_read = HVDIN_LOW;
-}
-
-board::HVDigitalIn::~HVDigitalIn(void)
-{
-	return;
-}
-
-uint8_t board::HVDigitalIn::read(void)
-{
-	// Auto inverts level to match board external connectors
-	uint8_t lvl = mcu::gpio_read(this->gpio_ch);
-	if(lvl>0) this->last_read = HVDIN_LOW;
-	else this->last_read = HVDIN_HIGH;
-	
-	return this->last_read;
-}
-
-/**** Private function definitions ****/
diff --git a/firmware/src/board/hvdin.h b/firmware/src/board/hvdin.h
deleted file mode 100644
index b0e6244..0000000
--- a/firmware/src/board/hvdin.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef HV_DIN_H_
-#define HV_DIN_H_
-
-/**** Includes ****/
-#include <stdint.h>
-
-namespace board {
-
-/**** Public definitions ****/
-const uint8_t HVDIN_LOW  = 0;
-const uint8_t HVDIN_HIGH = 1;
-
-class HVDigitalIn
-{
-	protected:
-	uint8_t gpio_ch;
-	
-	public:
-	HVDigitalIn(uint8_t gpio_ch, uint8_t init_read);
-	~HVDigitalIn(void);
-	
-	uint8_t last_read;
-	
-	uint8_t read(void);
-};
-
-/**** Public function declarations ****/
-
-#ifdef TESTING
-#endif
-
-} //namespace
-
-#endif /* HV_DIN_H_ */
\ No newline at end of file
diff --git a/firmware/src/board/od_com.cpp b/firmware/src/board/od_com.cpp
deleted file mode 100644
index 634b622..0000000
--- a/firmware/src/board/od_com.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/**** Includes ****/
-#include "../utils/utils.h"
-#include "mcu/mcu_hal.h"
-#include "od_com.h"
-
-using namespace board;
-
-/**** Private definitions ****/
-/**** Private constants ****/
-/**** Private variables ****/
-/**** Private function declarations ****/
-
-/**** Public function definitions ****/
-board::ODCommon::ODCommon(uint8_t pwm_ch)
-{
-	this->pwm_ch = pwm_ch;
-	this->write(0);
-}
-
-board::ODCommon::~ODCommon(void)
-{
-	this->write(0);
-}
-
-void board::ODCommon::write(uint8_t duty)
-{
-	// Convert percent to 16b duty cycle
-	uint16_t dc = util::percent_to_16b(duty);
-	
-	// Set PWM
-	mcu::pwm_write(this->pwm_ch, dc);
-	this->last_duty = duty;
-}
-
-uint8_t board::ODCommon::get_set_duty(void)
-{
-	return this->last_duty;
-}
-
-/**** Private function definitions ****/
diff --git a/firmware/src/board/od_com.h b/firmware/src/board/od_com.h
deleted file mode 100644
index f9fa3cd..0000000
--- a/firmware/src/board/od_com.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef OD_COMMON_H_
-#define OD_COMMON_H_
-
-/**** Includes ****/
-#include <stdint.h>
-
-namespace board {
-
-/**** Public definitions ****/
-class ODCommon
-{
-	protected:
-	uint8_t pwm_ch;
-	uint8_t last_duty;
-	
-	public:
-	ODCommon(uint8_t pwm_ch);
-	~ODCommon(void);
-	
-	void write(uint8_t duty);
-	uint8_t get_set_duty(void);
-};
-
-/**** Public function declarations ****/
-
-#ifdef TESTING
-#endif
-
-} //namespace
-
-#endif /* OD_COMMON_H_ */
\ No newline at end of file
diff --git a/firmware/src/board/odout.cpp b/firmware/src/board/odout.cpp
deleted file mode 100644
index a933e4b..0000000
--- a/firmware/src/board/odout.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**** Includes ****/
-#include "../utils/utils.h"
-#include "mcu/mcu_hal.h"
-#include "odout.h"
-
-using namespace board;
-
-/**** Private definitions ****/
-/**** Private constants ****/
-/**** Private variables ****/
-/**** Private function declarations ****/
-
-/**** Public function definitions ****/
-board::OpenDrainOut::OpenDrainOut(uint8_t gpio_ch)
-{
-	this->gpio_ch = gpio_ch;
-	this->write(OD_OFF);
-}
-
-board::OpenDrainOut::~OpenDrainOut(void)
-{
-	this->write(OD_OFF);
-}
-
-void board::OpenDrainOut::write(uint8_t state)
-{
-	if(state)
-	{
-		mcu::gpio_write(this->gpio_ch, mcu::LEVEL_HIGH);
-		this->last_set = OD_ON;
-	}
-	else
-	{
-		mcu::gpio_write(this->gpio_ch, mcu::LEVEL_LOW);
-		this->last_set = OD_OFF;
-	}
-}
-
-uint8_t board::OpenDrainOut::get_set_state(void)
-{
-	return this->last_set;
-}
-
-/**** Private function definitions ****/
diff --git a/firmware/src/board/odout.h b/firmware/src/board/odout.h
deleted file mode 100644
index 3e6b80e..0000000
--- a/firmware/src/board/odout.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef OD_OUT_H_
-#define OD_OUT_H_
-
-/**** Includes ****/
-#include <stdint.h>
-
-namespace board {
-
-/**** Public definitions ****/
-const uint8_t OD_OFF = 0;
-const uint8_t OD_ON = 1;
-
-class OpenDrainOut
-{
-	protected:
-	uint8_t gpio_ch;
-	uint8_t last_set;
-	
-	public:
-	OpenDrainOut(uint8_t gpio_ch);
-	~OpenDrainOut(void);
-	
-	void write(uint8_t state);
-	uint8_t get_set_state(void);
-};
-
-/**** Public function declarations ****/
-
-#ifdef TESTING
-#endif
-
-} //namespace
-
-#endif /* OD_OUT_H_ */
\ No newline at end of file