diff --git a/client/cmdtrace.c b/client/cmdtrace.c
index 81a51d88b..7402dfc08 100644
--- a/client/cmdtrace.c
+++ b/client/cmdtrace.c
@@ -28,9 +28,6 @@ static int usage_trace_list() {
     PrintAndLogEx(NORMAL, "    14b    - interpret data as iso14443b communications");
     PrintAndLogEx(NORMAL, "    15     - interpret data as iso15693 communications");
     PrintAndLogEx(NORMAL, "    des    - interpret data as DESFire communications");
-#ifdef WITH_EMV
-    PrintAndLogEx(NORMAL, "    emv    - interpret data as EMV / communications");
-#endif
     PrintAndLogEx(NORMAL, "    iclass - interpret data as iclass communications");
     PrintAndLogEx(NORMAL, "    topaz  - interpret data as topaz communications");
     PrintAndLogEx(NORMAL, "    7816   - interpret data as iso7816-4 communications");
diff --git a/client/comms.c b/client/comms.c
index 211614a56..d04581175 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -239,7 +239,7 @@ static void memcpy_filtered(void *dest, const void *src, size_t n, bool filter)
 #if defined(__linux__) || (__APPLE__)
     memcpy(dest, src, n);
 #else
-    if (filter)
+    if (filter) {
         // Filter out ANSI sequences on these OS
         uint16_t si=0;
         for (uint16_t i=0; i < n; i++) {
diff --git a/common/Makefile.hal b/common/Makefile.hal
index 58311189f..a40da3a9c 100644
--- a/common/Makefile.hal
+++ b/common/Makefile.hal
@@ -94,10 +94,6 @@ $(info $(findstring WITH_STANDALONE_*,$(PLATFORM_DEFS)))
 ifneq (,$(findstring WITH_FPC_,$(PLATFORM_DEFS)))
   PLATFORM_DEFS += -DWITH_FPC
 endif
-# WITH_EMV possible if WITH_ISO14443a :
-ifneq (,$(findstring WITH_ISO14443a,$(PLATFORM_DEFS)))
-  PLATFORM_DEFS += -DWITH_EMV
-endif
 
 PLATFORM_DEFS_INFO = $(strip $(filter-out STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS))))
 PLATFORM_DEFS_INFO_STANDALONE = $(strip $(subst STANDALONE_,, $(filter STANDALONE%, $(subst -DWITH_,,$(PLATFORM_DEFS)))))
diff --git a/common/i2c.c b/common/i2c.c
index b45d71e90..b2a9056d4 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -593,7 +593,7 @@ bool I2C_WriteFW(uint8_t *data, uint8_t len, uint8_t msb, uint8_t lsb, uint8_t d
 }
 
 void I2C_print_status(void) {
-    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816"));
+    DbpStringEx(FLAG_LOG|FLAG_ANSI, _BLUE_("Smart card module (ISO 7816)"));
     uint8_t resp[] = {0, 0, 0, 0};
     I2C_Reset_EnterMainProgram();
     uint8_t len = I2C_BufferRead(resp, sizeof(resp), I2C_DEVICE_CMD_GETVERSION, I2C_DEVICE_ADDRESS_MAIN);