diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
index f04bcb26..89f5fbb5 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
@@ -1,11 +1,10 @@
 package com.usatiuk.objects.iterators;
 
-import com.usatiuk.utils.AutoCloseableNoThrow;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Iterator;
 
-public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends Iterator<Pair<K, V>>, AutoCloseableNoThrow {
+public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends Iterator<Pair<K, V>>, AutoCloseable {
     K peekNextKey();
 
     void skip();
@@ -21,4 +20,7 @@ public interface CloseableKvIterator<K extends Comparable<? super K>, V> extends
     default CloseableKvIterator<K, V> reversed() {
         return new ReversedKvIterator<K, V>(this);
     }
+
+    @Override
+    void close();
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
index f553fab2..bd67866f 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
@@ -3,19 +3,20 @@ package com.usatiuk.objects.snapshot;
 import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
 import com.usatiuk.objects.iterators.MaybeTombstone;
-import com.usatiuk.objects.iterators.Tombstone;
-import com.usatiuk.utils.AutoCloseableNoThrow;
 
 import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Stream;
 
-public interface Snapshot<K extends Comparable<K>, V> extends AutoCloseableNoThrow {
+public interface Snapshot<K extends Comparable<K>, V> extends AutoCloseable {
     List<CloseableKvIterator<K, MaybeTombstone<V>>> getIterator(IteratorStart start, K key);
 
     @Nonnull
     Optional<V> readObject(K name);
 
     long id();
+
+    @Override
+    void close();
+
 }
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionImpl.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionImpl.java
index f501f6cc..fdf8448e 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionImpl.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionImpl.java
@@ -5,14 +5,13 @@ import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.*;
 import com.usatiuk.objects.snapshot.Snapshot;
-import com.usatiuk.utils.AutoCloseableNoThrow;
 import com.usatiuk.utils.ListUtils;
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.*;
 
-class TransactionImpl implements Transaction, AutoCloseableNoThrow {
+class TransactionImpl implements Transaction, AutoCloseable {
     private final Map<JObjectKey, Optional<JDataVersionedWrapper>> _readSet = new HashMap<>();
     private final NavigableMap<JObjectKey, TxRecord.TxObjectRecord<?>> _writes = new TreeMap<>();
     private final List<Runnable> _onCommit = new LinkedList<>();