diff --git a/libsession-util/build.gradle b/libsession-util/build.gradle
index 10d1845f7b..560fd2aadb 100644
--- a/libsession-util/build.gradle
+++ b/libsession-util/build.gradle
@@ -16,9 +16,6 @@ android {
             cmake {
             }
         }
-//        ndk {
-//            abiFilters 'x86_64', 'arm64-v8a' ,'x86', 'armeabi-v7a'
-//        }
     }
 
     buildTypes {
diff --git a/libsession-util/src/main/cpp/CMakeLists.txt b/libsession-util/src/main/cpp/CMakeLists.txt
index 24d389c8cb..1027d9973f 100644
--- a/libsession-util/src/main/cpp/CMakeLists.txt
+++ b/libsession-util/src/main/cpp/CMakeLists.txt
@@ -47,9 +47,10 @@ find_library( # Sets the name of the path variable.
 # Copy libsodium-internal.so into the library output dir manually because gradle invokes cmake in
 # ways that doesn't properly do this:
 get_target_property(sodium_lib_loc libsodium-internal IMPORTED_LOCATION)
+get_filename_component(sodium_lib_filename "${sodium_lib_loc}" NAME)
 add_custom_command(TARGET session_util POST_BUILD
     COMMAND
-    ${CMAKE_COMMAND} -E copy ${sodium_lib_loc} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+    ${CMAKE_COMMAND} -E copy ${sodium_lib_loc} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsodium.so)#${PROJECT_SOURCE_DIR}/../jniLibs/${CMAKE_ANDROID_ARCH_ABI}/${sodium_lib_filename})
 
 # Specifies libraries CMake should link to your target library. You
 # can link multiple libraries, such as libraries you define in this
diff --git a/libsession-util/src/main/java/network/loki/messenger/libsession_util/NativeLib.kt b/libsession-util/src/main/java/network/loki/messenger/libsession_util/NativeLib.kt
deleted file mode 100644
index 0b29d5e4de..0000000000
--- a/libsession-util/src/main/java/network/loki/messenger/libsession_util/NativeLib.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package network.loki.messenger.libsession_util
-
-class NativeLib {
-
-    companion object {
-        // Used to load the 'libsession_util' library on application startup.
-        init {
-            System.loadLibrary("session_util")
-        }
-    }
-}
\ No newline at end of file