diff --git a/configure.ac b/configure.ac
index 21238d4..3acf9b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # General init
 
 # /!\ Don't forget to update 'CMakeLists.txt' too /!\
-AC_INIT(libnfc, 1.6.0, info@libnfc.org)
+AC_INIT(libnfc, 1.6.0-rc1, info@libnfc.org)
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index d3fd23b..4fa0075 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,13 @@
-SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-forum-tag2 nfc-emulate-tag nfc-emulate-uid nfc-poll nfc-relay)
+SET(EXAMPLES-SOURCES
+  nfc-anticol
+  nfc-dep-initiator
+  nfc-dep-target
+  nfc-emulate-forum-tag2
+  nfc-emulate-tag
+  nfc-emulate-uid
+  nfc-poll
+  nfc-relay
+)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)
 
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 30ea767..bf5f109 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,13 @@
-SET(UTILS-SOURCES nfc-emulate-forum-tag4 nfc-list nfc-relay-picc nfc-mfclassic nfc-mfultralight)
+SET(UTILS-SOURCES 
+  nfc-emulate-forum-tag4
+  nfc-list
+  nfc-mfclassic
+  nfc-mfsetuid
+  nfc-mfultralight
+  nfc-probe
+  nfc-read-forum-tag3
+  nfc-relay-picc
+)
 
 ADD_LIBRARY(nfcutils STATIC 
   nfc-utils.c
diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c
index cfde54b..a08d5cd 100644
--- a/utils/nfc-mfclassic.c
+++ b/utils/nfc-mfclassic.c
@@ -410,24 +410,6 @@ write_card (int write_block_zero)
   return true;
 }
 
-static void
-mifare_classic_extract_payload (const char *abDump, char *pbPayload)
-{
-  uint8_t uiSectorIndex;
-  uint8_t uiBlockIndex;
-  size_t  szDumpOffset;
-  size_t  szPayloadIndex = 0;
-
-  for (uiSectorIndex = 1; uiSectorIndex < 16; uiSectorIndex++) {
-    for (uiBlockIndex = 0; uiBlockIndex < 3; uiBlockIndex++) {
-      szDumpOffset = uiSectorIndex * 16 * 4 + uiBlockIndex * 16;
-//      for(uint8_t uiByteIndex=0; uiByteIndex<16; uiByteIndex++) printf("%02x ", abDump[szPayloadIndex+uiByteIndex]);
-      memcpy (pbPayload + szPayloadIndex, abDump + szDumpOffset, 16);
-      szPayloadIndex += 16;
-    }
-  }
-}
-
 typedef enum {
   ACTION_READ,
   ACTION_WRITE,