diff --git a/drivers/ads7843.c b/drivers/ads7843.c
deleted file mode 100644
index 5349ab08..00000000
--- a/drivers/ads7843.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include "drivers/ads7843.h"
-
-#ifdef TOUCHPAD_USE_ADS7843
-
-__inline uint16_t lld_readX(void) {
-    uint8_t txbuf[1];
-    uint8_t rxbuf[2];
-    uint16_t x;
-
-    txbuf[0] = 0xd0;
-    SET_CS(0);
-    spiSend(&SPID1, 1, txbuf);
-    spiReceive(&SPID1, 2, rxbuf);
-    SET_CS(1);
-
-    x = rxbuf[0] << 4;
-    x |= rxbuf[1] >> 4;
-        
-    return x;
-}
-
-__inline uint16_t lld_readY(void) {
-    uint8_t txbuf[1];
-    uint8_t rxbuf[2];
-    uint16_t x;
-
-    txbuf[0] = 0x90;
-    SET_CS(0);
-    spiSend(&SPID1, 1, txbuf);
-    spiReceive(&SPID1, 2, rxbuf);
-    SET_CS(1);
-
-    x = rxbuf[0] << 4;
-    x |= rxbuf[1] >> 4;
-        
-    return x;
-
-}
-
-#endif
-
diff --git a/drivers/ads7843.h b/drivers/ads7843.h
deleted file mode 100644
index a04678e5..00000000
--- a/drivers/ads7843.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef ADS7843_H
-#define ADS7843_h
-
-#ifdef TOUCHPAD_USE_ADS7843
-#include "touchpad.h"
-
-uint16_t lld_readX(void):
-uint16_t lld_readY(void)
-
-#endif
-#endif
diff --git a/touchpad.c b/touchpad.c
index 611bd6bc..6f786f77 100644
--- a/touchpad.c
+++ b/touchpad.c
@@ -17,11 +17,37 @@ void tpInit(SPIDriver *spip) {
 }
 
 static __inline uint16_t readX(void) {
-	return lld_readX();
+	uint8_t txbuf[1];
+	uint8_t rxbuf[2];
+	uint16_t x;
+
+	txbuf[0] = 0xd0;
+	SET_CS(0);
+	spiSend(&SPID1, 1, txbuf);
+	spiReceive(&SPID1, 2, rxbuf);
+	SET_CS(1);
+
+	x = rxbuf[0] << 4;
+	x |= rxbuf[1] >> 4;
+	
+	return x;
 }
 
 static __inline uint16_t readY(void) {
-	return lld_readY();
+	uint8_t txbuf[1];
+    uint8_t rxbuf[2];
+    uint16_t y;
+
+    txbuf[0] = 0x90;
+    SET_CS(0);
+    spiSend(&SPID1, 1, txbuf);
+    spiReceive(&SPID1, 2, rxbuf);
+    SET_CS(1);
+
+    y = rxbuf[0] << 4;
+    y |= rxbuf[1] >> 4;
+
+	return y;
 }
 
 uint8_t tpIRQ(void) {