diff --git a/armsrc/Makefile b/armsrc/Makefile
index 3f85360b5..cc7e3e859 100644
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -49,7 +49,6 @@ SRC_ISO14443b = iso14443b.c
 SRC_FELICA = felica.c
 SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c 
-#SRC_EMV = tlv.c emvdataels.c emvutil.c emvcmd.c 									 
 SRC_ICLASS = iclass.c optimized_cipher.c
 SRC_LEGIC = legicrf.c legic_prng.c
 SRC_FLASH = flash.c
diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 0060f3482..acfe4356b 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -914,35 +914,7 @@ void UsbPacketReceived(uint8_t *packet, int len) {
 		case CMD_MIFARE_COLLECT_NONCES:
 			break;
 #endif
-#ifdef WITH_EMV
-		case CMD_EMV_TRANSACTION:
-			EMVTransaction();
-			break;
-        case CMD_EMV_GET_RANDOM_NUM:
-            //EMVgetUDOL();
-            break;
-        case CMD_EMV_LOAD_VALUE:
-            EMVloadvalue(c->arg[0], c->d.asBytes);  
-            break;
-        case CMD_EMV_DUMP_CARD:
-            EMVdumpcard();
-			break;		
-       case CMD_EMV_READ_RECORD:
-            EMVReadRecord(c->arg[0], c->arg[1], NULL);
-            break; 
-        case CMD_EMV_CLONE:
-            EMVClone(c->arg[0], c->arg[1]);
-            break;
-       case CMD_EMV_SIM:
-            EMVSim();
-            break;
-        case CMD_EMV_TEST:
-            EMVTest();
-            break;
-        case CMD_EMV_FUZZ_RATS:
-            EMVFuzz_RATS(c->arg[0],c->d.asBytes);
-            break;
-#endif
+
 #ifdef WITH_ICLASS
 		// Makes use of ISO14443a FPGA Firmware
 		case CMD_SNOOP_ICLASS:
diff --git a/armsrc/apps.h b/armsrc/apps.h
index 525440363..d60e42409 100644
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -29,7 +29,6 @@ extern "C" {
 #include "pcf7931.h"
 #include "desfire.h"
 #include "iso14443b.h"
-#include "emvcard.h"
 #include "Standalone/standalone.h"
 
 extern const uint8_t OddByteParity[256];
@@ -240,21 +239,6 @@ extern void HfSnoopISO18(uint32_t samples, uint32_t triggers);
 extern void HfSimLite(uint64_t uid);
 extern void HfDumpFelicaLiteS();
 
-//EMV functions
-// emvcmd.h
-extern void EMVTransaction(void);
-extern void EMVgetUDOL(void);
-extern void EMVloadvalue(uint32_t tag, uint8_t* datain);
-extern void EMVdumpcard(void);
-//extern void EMVSelect(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *data);
-extern void EMVFuzz_RATS(uint8_t ratslen, uint8_t* RATS);
-extern void EMVReadRecord(uint8_t arg0, uint8_t arg1,emvcard* inputcard);
-extern void EMVSelectPPSE();
-extern void EMVSelectAID(uint8_t *AID, uint8_t AIDlen, emvcard* inputcard);
-extern void EMVClone(uint8_t maxsfi, uint8_t maxrecord);
-extern void EMVSim();
-extern void EMVTest();
-
 #ifdef __cplusplus
 }
 #endif