diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
index 72187171e..168555593 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
@@ -1,25 +1,19 @@
 package ru.dbotthepony.mc.otm.compat.curios
 
-import com.google.common.collect.Iterators
 import com.google.common.collect.Streams
-import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.Slot
 import net.minecraft.world.item.ItemStack
 import net.minecraftforge.fml.ModList
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
-import ru.dbotthepony.mc.otm.container.awareIterator
 import ru.dbotthepony.mc.otm.container.awareStream
-import ru.dbotthepony.mc.otm.container.iterator
 import ru.dbotthepony.mc.otm.container.stream
 import ru.dbotthepony.mc.otm.core.AwareItemStack
-import ru.dbotthepony.mc.otm.core.EmptyMutableIterator
-import ru.dbotthepony.mc.otm.core.IAwareItemStackIterator
 import ru.dbotthepony.mc.otm.core.orNull
 import top.theillusivec4.curios.api.CuriosApi
 import top.theillusivec4.curios.common.inventory.CosmeticCurioSlot
 import top.theillusivec4.curios.common.inventory.CurioSlot
-import java.util.LinkedList
+import java.util.*
 import java.util.stream.Stream
 
 val isCuriosLoaded by lazy {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerIterator.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerIterator.kt
index 7a1c637f9..3bc112f53 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerIterator.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/container/ContainerIterator.kt
@@ -4,7 +4,6 @@ import it.unimi.dsi.fastutil.objects.ObjectIterators
 import net.minecraft.world.Container
 import net.minecraft.world.item.ItemStack
 import ru.dbotthepony.mc.otm.core.ContainerItemStackEntry
-import ru.dbotthepony.mc.otm.core.IAwareItemStackIterator
 import ru.dbotthepony.mc.otm.core.AwareItemStack
 
 class ContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedListIterator<ItemStack>(0, initialPosition), MutableListIterator<ItemStack> {
@@ -33,7 +32,7 @@ class ContainerIterator(private val container: Container, initialPosition: Int =
 	}
 }
 
-class AwareContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedIterator<AwareItemStack>(0, initialPosition), IAwareItemStackIterator {
+class AwareContainerIterator(private val container: Container, initialPosition: Int = 0) : ObjectIterators.AbstractIndexBasedIterator<AwareItemStack>(0, initialPosition), Iterator<AwareItemStack> {
 	init {
 		require(initialPosition in 0 .. container.containerSize) { "Invalid initial position: $initialPosition" }
 	}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/AwareItemStack.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/AwareItemStack.kt
index e3850b858..3222c9e15 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/AwareItemStack.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/AwareItemStack.kt
@@ -21,8 +21,6 @@ interface AwareItemStack {
 	fun extract(amount: Int, simulate: Boolean = true): ItemStack
 }
 
-typealias IAwareItemStackIterator = Iterator<AwareItemStack>
-
 data class ContainerItemStackEntry(val index: Int, val container: Container) : AwareItemStack {
 	override fun component0(): ItemStack {
 		return container[index]