diff --git a/lib/src/main/cpp/CMakeLists.txt b/lib/src/main/cpp/CMakeLists.txt
index d72816b..c335b10 100644
--- a/lib/src/main/cpp/CMakeLists.txt
+++ b/lib/src/main/cpp/CMakeLists.txt
@@ -10,7 +10,6 @@ add_library(
         zim_wrapper
 
         SHARED
-        common.cpp
         libzim/archive.cpp
         libzim/entry.cpp
         libzim/entry_iterator.cpp
diff --git a/lib/src/main/cpp/common.cpp b/lib/src/main/cpp/common.cpp
deleted file mode 100644
index f510798..0000000
--- a/lib/src/main/cpp/common.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#include <thread>
-
-std::mutex globalLock;
diff --git a/lib/src/main/cpp/libkiwix/kiwixicu.cpp b/lib/src/main/cpp/libkiwix/kiwixicu.cpp
index 3cc2a72..bc94cf6 100644
--- a/lib/src/main/cpp/libkiwix/kiwixicu.cpp
+++ b/lib/src/main/cpp/libkiwix/kiwixicu.cpp
@@ -27,12 +27,9 @@
 #include "utils.h"
 #include "zim/tools.h"
 
-std::mutex globalLock;
-
 JNIEXPORT void JNICALL Java_org_kiwix_kiwixlib_JNIICU_setDataDirectory(
     JNIEnv* env, jclass kclass, jstring dirStr)
 {
-  Lock l;
   try {
     zim::setICUDataDirectory(TO_C(dirStr));
   } catch (...) {
diff --git a/lib/src/main/cpp/libkiwix/kiwixserver.cpp b/lib/src/main/cpp/libkiwix/kiwixserver.cpp
index e584adb..289e203 100644
--- a/lib/src/main/cpp/libkiwix/kiwixserver.cpp
+++ b/lib/src/main/cpp/libkiwix/kiwixserver.cpp
@@ -35,7 +35,6 @@
 METHOD(void, setNativeServer, jobject jLibrary)
 {
   LOG("Attempting to create server");
-  Lock l;
   try {
     auto library = getPtr<kiwix::Library>(env, jLibrary);
     SET_PTR(std::make_shared<NATIVE_TYPE>(library.get()));
diff --git a/lib/src/main/cpp/libzim/archive.cpp b/lib/src/main/cpp/libzim/archive.cpp
index bb49ee3..3392977 100644
--- a/lib/src/main/cpp/libzim/archive.cpp
+++ b/lib/src/main/cpp/libzim/archive.cpp
@@ -41,7 +41,6 @@ METHOD(void, setNativeArchive, jstring filename)
   std::string cPath = TO_C(filename);
 
   LOG("Attempting to create reader with: %s", cPath.c_str());
-  Lock l;
   try {
     auto archive = std::make_shared<zim::Archive>(cPath);
     SET_PTR(archive);
@@ -78,7 +77,6 @@ JNIEXPORT void JNICALL Java_org_kiwix_libzim_Archive_setNativeArchiveByFD(
   int fd = jni2fd(fdObj, env);
 
   LOG("Attempting to create reader with fd: %d", fd);
-  Lock l;
   try {
     auto archive = std::make_shared<zim::Archive>(fd);
     SET_PTR(archive);
@@ -99,7 +97,6 @@ JNIEXPORT void JNICALL Java_org_kiwix_libzim_Archive_setNativeArchiveEmbedded(
   int fd = jni2fd(fdObj, env);
 
   LOG("Attempting to create reader with fd: %d", fd);
-  Lock l;
   try {
     auto archive = std::make_shared<zim::Archive>(fd, offset, size);
     SET_PTR(archive);
diff --git a/lib/src/main/cpp/libzim/query.cpp b/lib/src/main/cpp/libzim/query.cpp
index 2578d66..6117b4d 100644
--- a/lib/src/main/cpp/libzim/query.cpp
+++ b/lib/src/main/cpp/libzim/query.cpp
@@ -36,7 +36,6 @@
 METHOD(void, setNativeQuery, jstring query)
 {
   auto cQuery = TO_C(query);
-  Lock l;
   try {
     auto query = std::make_shared<NATIVE_TYPE>(cQuery);
     SET_PTR(query);
diff --git a/lib/src/main/cpp/libzim/searcher.cpp b/lib/src/main/cpp/libzim/searcher.cpp
index cbad5c3..9810ba2 100644
--- a/lib/src/main/cpp/libzim/searcher.cpp
+++ b/lib/src/main/cpp/libzim/searcher.cpp
@@ -35,8 +35,6 @@
 
 METHOD(void, setNativeSearcher, jobject archive)
 {
-
-  Lock l;
   auto cArchive = getPtr<zim::Archive>(env, archive);
   try {
     auto searcher = std::make_shared<zim::Searcher>(*cArchive);
diff --git a/lib/src/main/cpp/libzim/suggestion_searcher.cpp b/lib/src/main/cpp/libzim/suggestion_searcher.cpp
index 7e34c4f..792447e 100644
--- a/lib/src/main/cpp/libzim/suggestion_searcher.cpp
+++ b/lib/src/main/cpp/libzim/suggestion_searcher.cpp
@@ -35,8 +35,6 @@
 
 METHOD(void, setNativeSearcher, jobject archive)
 {
-
-  Lock l;
   auto cArchive = getPtr<zim::Archive>(env, archive);
   try {
     auto searcher = std::make_shared<zim::SuggestionSearcher>(*cArchive);
diff --git a/lib/src/main/cpp/utils.h b/lib/src/main/cpp/utils.h
index 220a317..00529dd 100644
--- a/lib/src/main/cpp/utils.h
+++ b/lib/src/main/cpp/utils.h
@@ -37,7 +37,6 @@
  #define LOG(...)
 #endif
 
-extern std::mutex globalLock;
 using std::shared_ptr;
 
 // Here is the wrapping structure.
@@ -131,13 +130,6 @@ inline jobject buildWrapper(JNIEnv* env, const char* class_name, T&& obj, const
 #define BUILD_WRAPPER(CLASSNAME, OBJ) buildWrapper(env, CLASSNAME, std::move(OBJ))
 
 
-// A mixin class which will lock the globalLock when a instance is created
-// This avoid the cration of two instance inheriting from Lock in the same time.
-class Lock : public std::unique_lock<std::mutex>
-{
- public:
-  Lock() : std::unique_lock<std::mutex>(globalLock) { }
-};
 
 // ---------------------------------------------------------------------------
 // Convert things to JAVA