diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
index 9f7f0845..39ef162e 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
@@ -6,6 +6,7 @@ import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.snapshot.Snapshot;
 import com.usatiuk.objects.stores.WritebackObjectPersistentStore;
 import com.usatiuk.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.DataLocker;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.StartupEvent;
 import jakarta.annotation.Priority;
@@ -27,9 +28,9 @@ public class JObjectManager {
     WritebackObjectPersistentStore writebackObjectPersistentStore;
     @Inject
     TransactionFactory transactionFactory;
-    @Inject
-    LockManager lockManager;
+
     private boolean _ready = false;
+    private final DataLocker _objLocker = new DataLocker();
 
     static {
         _preCommitTxHooks = List.copyOf(CDI.current().select(PreCommitTxHook.class).stream().sorted(Comparator.comparingInt(PreCommitTxHook::getPriority)).toList());
@@ -162,7 +163,7 @@ public class JObjectManager {
                 for (var key : toLock) {
                     if (tx.knownNew().contains(key))
                         continue;
-                    var lock = lockManager.lockObject(key);
+                    var lock = _objLocker.lock(key);
                     toUnlock.add(lock);
                 }
 
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java
deleted file mode 100644
index ab2eed3b..00000000
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.usatiuk.objects.transaction;
-
-import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.utils.AutoCloseableNoThrow;
-import com.usatiuk.utils.DataLocker;
-import jakarta.annotation.Nonnull;
-import jakarta.annotation.Nullable;
-import jakarta.inject.Singleton;
-
-@Singleton
-public class LockManager {
-    private final DataLocker _objLocker = new DataLocker();
-
-    @Nonnull
-    public AutoCloseableNoThrow lockObject(JObjectKey key) {
-        return _objLocker.lock(key);
-    }
-
-    @Nullable
-    public AutoCloseableNoThrow tryLockObject(JObjectKey key) {
-        return _objLocker.tryLock(key);
-    }
-}
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java
index 2dbef1c2..6819b087 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionFactoryImpl.java
@@ -19,10 +19,6 @@ import java.util.*;
 public class TransactionFactoryImpl implements TransactionFactory {
     @Inject
     WritebackObjectPersistentStore writebackObjectPersistentStore;
-    @Inject
-    LockManager lockManager;
-    @ConfigProperty(name = "dhfs.objects.transaction.never-lock")
-    boolean neverLock;
 
     @Override
     public TransactionPrivate createTransaction() {
diff --git a/dhfs-parent/objects/src/main/resources/application.properties b/dhfs-parent/objects/src/main/resources/application.properties
index 34da9330..470a92f9 100644
--- a/dhfs-parent/objects/src/main/resources/application.properties
+++ b/dhfs-parent/objects/src/main/resources/application.properties
@@ -5,7 +5,6 @@ dhfs.objects.lru.print-stats=false
 dhfs.objects.lock_timeout_secs=15
 dhfs.objects.persistence.files.root=${HOME}/dhfs_default/data/objs
 dhfs.objects.persistence.snapshot-extra-checks=false
-dhfs.objects.transaction.never-lock=true
 dhfs.objects.last-seen.update=60
 dhfs.objects.last-seen.timeout=43200
 quarkus.log.category."com.usatiuk.objects.iterators".level=INFO