diff --git a/features/storage/FEATURE_STORAGE/TESTS/cfstore/create/create.cpp b/features/storage/FEATURE_STORAGE/TESTS/cfstore/create/create.cpp
index d84f4482407..981f6c85904 100644
--- a/features/storage/FEATURE_STORAGE/TESTS/cfstore/create/create.cpp
+++ b/features/storage/FEATURE_STORAGE/TESTS/cfstore/create/create.cpp
@@ -536,11 +536,11 @@ int32_t cfstore_create_test_05_core(const size_t call_count)
         snprintf(kv_name_tag_buf, kv_name_tag_len+1, "%0d", (int) i);
         ret = cfstore_create_kv_create(kv_name_min_len, kv_name_tag_buf, value_buf, kv_value_min_len/64 * (i+1));
         if(ret == ARM_CFSTORE_DRIVER_ERROR_OUT_OF_MEMORY){
-            CFSTORE_ERRLOG("Out of memory on %d-th KV, trying to allocate memory totalling %d.\n", (int) i, (int) bytes_stored);
+            CFSTORE_ERRLOG("Out of memory on %d-th KV.\n", (int) i);
             break;
         }
         /* revert CFSTORE_LOG for more trace */
-        CFSTORE_DBGLOG("Successfully stored %d-th KV bytes,  totalling %d.\n", (int) i, (int) bytes_stored);
+        CFSTORE_DBGLOG("Successfully stored %d-th KV.\n", (int) i);
     }
     ret = cfstore_test_delete_all();
     CFSTORE_TEST_UTEST_MESSAGE(cfstore_create_utest_msg_g, CFSTORE_UTEST_MSG_BUF_SIZE, "%s:Error: failed to delete_all() attributes to clean up after test.\n", __func__);
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_debug.h b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_debug.h
index 8d8b7fea543..ea95ceaffaf 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_debug.h
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_debug.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <assert.h>
+#include <stdio.h>
 
 
 /* Debug Support */
@@ -27,9 +28,7 @@
         printf(_fmt, __VA_ARGS__);                      \
   }while(0);
 
-//todo: restore #define noCFSTORE_DEBUG
 #define noCFSTORE_DEBUG
-//#define CFSTORE_DEBUG
 #ifdef CFSTORE_DEBUG
 
 extern uint32_t cfstore_optDebug_g;
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
index 840c29a2eec..75bf35e1d10 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/cfstore_svm.cpp
@@ -47,7 +47,7 @@ StorageVolumeManager volumeManager;
 /* used only for the initialization of the volume-manager. */
 static void cfstore_svm_volume_manager_initialize_callback(int32_t status)
 {
-    CFSTORE_FENTRYLOG("%s: operation %d with status %d" , __func__, (int) operation, (int) status);
+    CFSTORE_FENTRYLOG("%s: with status %d" , __func__, (int) status);
 }
 
 static void cfstore_svm_journal_mtc_callback(int32_t status, ARM_STORAGE_OPERATION operation)
diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
index edeb5d71239..c68651a7fee 100644
--- a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
+++ b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c
@@ -46,10 +46,8 @@
 
 #ifdef CFSTORE_DEBUG
 uint32_t cfstore_optDebug_g = 1;
-//todo: restore uint32_t cfstore_optLogLevel_g = CFSTORE_LOG_NONE; /*CFSTORE_LOG_NONE|CFSTORE_LOG_ERR|CFSTORE_LOG_DEBUG|CFSTORE_LOG_FENTRY */
-//uint32_t cfstore_optLogTracepoint_g = CFSTORE_TP_NONE; /*CFSTORE_TP_NONE|CFSTORE_TP_CLOSE|CFSTORE_TP_CREATE|CFSTORE_TP_DELETE|CFSTORE_TP_FILE|CFSTORE_TP_FIND|CFSTORE_TP_FLUSH|CFSTORE_TP_INIT|CFSTORE_TP_OPEN|CFSTORE_TP_READ|CFSTORE_TP_WRITE|CFSTORE_TP_VERBOSE1|CFSTORE_TP_VERBOSE2|CFSTORE_TP_VERBOSE3|CFSTORE_TP_FENTRY; */
-uint32_t cfstore_optLogLevel_g = CFSTORE_LOG_NONE|CFSTORE_LOG_ERR|CFSTORE_LOG_DEBUG|CFSTORE_LOG_FENTRY;
-uint32_t cfstore_optLogTracepoint_g = CFSTORE_TP_NONE|CFSTORE_TP_CLOSE|CFSTORE_TP_CREATE|CFSTORE_TP_DELETE|CFSTORE_TP_FILE|CFSTORE_TP_FIND|CFSTORE_TP_FLUSH|CFSTORE_TP_INIT|CFSTORE_TP_OPEN|CFSTORE_TP_READ|CFSTORE_TP_WRITE|CFSTORE_TP_VERBOSE1|CFSTORE_TP_VERBOSE2|CFSTORE_TP_VERBOSE3|CFSTORE_TP_FENTRY;
+uint32_t cfstore_optLogLevel_g = CFSTORE_LOG_NONE; /*CFSTORE_LOG_NONE|CFSTORE_LOG_ERR|CFSTORE_LOG_DEBUG|CFSTORE_LOG_FENTRY */
+uint32_t cfstore_optLogTracepoint_g = CFSTORE_TP_NONE; /*CFSTORE_TP_NONE|CFSTORE_TP_CLOSE|CFSTORE_TP_CREATE|CFSTORE_TP_DELETE|CFSTORE_TP_FILE|CFSTORE_TP_FIND|CFSTORE_TP_FLUSH|CFSTORE_TP_INIT|CFSTORE_TP_OPEN|CFSTORE_TP_READ|CFSTORE_TP_WRITE|CFSTORE_TP_VERBOSE1|CFSTORE_TP_VERBOSE2|CFSTORE_TP_VERBOSE3|CFSTORE_TP_FENTRY; */
 #endif