diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 68fc6b33fe6..9065e2548bd 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -2,8 +2,6 @@ package com.github.codeql
 
 import com.github.codeql.utils.isInterfaceLike
 import com.intellij.openapi.util.TextRange
-import extractClassSource
-import extractFunction
 import org.jetbrains.kotlin.analysis.api.components.KaDiagnosticCheckerFilter
 import org.jetbrains.kotlin.analysis.api.KaSession
 import org.jetbrains.kotlin.analysis.api.types.KaType
@@ -12,7 +10,6 @@ import org.jetbrains.kotlin.analysis.api.KaExperimentalApi
 import org.jetbrains.kotlin.analysis.api.symbols.*
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.parsing.parseNumericLiteral
-import useType
 import java.io.Closeable
 import java.util.*
 
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
index 805698a082e..5a4576dc953 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
@@ -7,7 +7,6 @@ import org.jetbrains.kotlin.analysis.api.types.KaClassType
 import org.jetbrains.kotlin.analysis.api.types.KaType
 import org.jetbrains.kotlin.asJava.elements.psiType
 import org.jetbrains.kotlin.psi.*
-import useClassSource
 
 /*
 OLD: KE1
diff --git a/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt b/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
index 394e26e987f..1949f819fe0 100644
--- a/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/entities/Class.kt
@@ -1,3 +1,5 @@
+package com.github.codeql
+
 import com.github.codeql.*
 import com.github.codeql.KotlinUsesExtractor.ClassLabelResults
 import com.github.codeql.KotlinUsesExtractor.TypeContext
diff --git a/java/kotlin-extractor2/src/main/kotlin/entities/Function.kt b/java/kotlin-extractor2/src/main/kotlin/entities/Function.kt
index 0ff0bf2036b..90b80289df6 100644
--- a/java/kotlin-extractor2/src/main/kotlin/entities/Function.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/entities/Function.kt
@@ -1,4 +1,5 @@
-import com.github.codeql.*
+package com.github.codeql
+
 import com.github.codeql.KotlinUsesExtractor.TypeContext
 import org.jetbrains.kotlin.analysis.api.symbols.KaFunctionSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.name