diff --git a/java/kotlin-extractor2/src/main/kotlin/ExternalDeclExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/ExternalDeclExtractor.kt
index 43cfad2f621..a93065bed11 100644
--- a/java/kotlin-extractor2/src/main/kotlin/ExternalDeclExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/ExternalDeclExtractor.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.isExternalFileClassMember
 import com.semmle.extractor.java.OdasaOutput
 import com.semmle.util.data.StringDigestor
@@ -202,3 +204,4 @@ class ExternalDeclExtractor(
         output.writeTrapSet()
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorCommandLineProcessor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorCommandLineProcessor.kt
index 72be6d89dc1..c714a2d9d85 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorCommandLineProcessor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorCommandLineProcessor.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption
 import org.jetbrains.kotlin.compiler.plugin.CliOption
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
@@ -98,3 +100,4 @@ private val OPTION_COMPILATION_STARTTIME = "compilationStartTime"
 val KEY_COMPILATION_STARTTIME = CompilerConfigurationKey<Long>(OPTION_COMPILATION_STARTTIME)
 private val OPTION_EXIT_AFTER_EXTRACTION = "exitAfterExtraction"
 val KEY_EXIT_AFTER_EXTRACTION = CompilerConfigurationKey<Boolean>(OPTION_EXIT_AFTER_EXTRACTION)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorComponentRegistrar.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorComponentRegistrar.kt
index 7fd6416dcd6..8d6948dd5b3 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorComponentRegistrar.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorComponentRegistrar.kt
@@ -3,6 +3,8 @@
 
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.intellij.mock.MockProject
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -27,3 +29,4 @@ class KotlinExtractorComponentRegistrar : Kotlin2ComponentRegistrar() {
         )
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorExtension.kt
index 3850d690a61..63631a47445 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorExtension.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinExtractorExtension.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.versions.usesK2
 import com.semmle.util.files.FileUtil
 import com.semmle.util.trap.pathtransformers.PathTransformer
@@ -582,3 +584,4 @@ private class GZipCompressedTrapFileWriter(logger: FileLogger, trapName: String)
         )
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
index 47288394904..979ad6f6872 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinFileExtractor.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.comments.CommentExtractorLighterAST
 import com.github.codeql.comments.CommentExtractorPSI
 import com.github.codeql.utils.*
@@ -9208,3 +9210,4 @@ open class KotlinFileExtractor(
         CALLABLE_CLASS(13),
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
index 3be94d65690..9d91bd02aac 100644
--- a/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/KotlinUsesExtractor.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.*
 import com.github.codeql.utils.versions.*
 import com.semmle.extractor.java.OdasaOutput
@@ -2249,3 +2251,4 @@ open class KotlinUsesExtractor(
         return tw.getVariableLabelFor<DbLocalvar>(v)
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/Label.kt b/java/kotlin-extractor2/src/main/kotlin/Label.kt
index 65d5fe72461..cd2edcf2802 100644
--- a/java/kotlin-extractor2/src/main/kotlin/Label.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/Label.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 /** This represents a label (`#...`) in a TRAP file. */
 interface Label<T : AnyDbType> {
     fun <U : AnyDbType> cast(): Label<U> {
@@ -19,3 +21,4 @@ class IntLabel<T : AnyDbType>(val i: Int) : Label<T> {
 class StringLabel<T : AnyDbType>(val name: String) : Label<T> {
     override fun toString(): String = "#$name"
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/LinesOfCode.kt b/java/kotlin-extractor2/src/main/kotlin/LinesOfCode.kt
index b8cd198922e..c97014a23ad 100644
--- a/java/kotlin-extractor2/src/main/kotlin/LinesOfCode.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/LinesOfCode.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.*
 
 class LinesOfCode(val logger: FileLogger, val tw: FileTrapWriter, val file: IrFile) {
@@ -28,3 +30,4 @@ class LinesOfCode(val logger: FileLogger, val tw: FileTrapWriter, val file: IrFi
         }
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/LinesOfCodePSI.kt b/java/kotlin-extractor2/src/main/kotlin/LinesOfCodePSI.kt
index 452ed13200c..19238346880 100644
--- a/java/kotlin-extractor2/src/main/kotlin/LinesOfCodePSI.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/LinesOfCodePSI.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.versions.getPsi2Ir
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
@@ -148,3 +150,4 @@ class LinesOfCodePSI(val logger: FileLogger, val tw: FileTrapWriter, val file: I
         var containsCode = false
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/MetaAnnotationSupport.kt b/java/kotlin-extractor2/src/main/kotlin/MetaAnnotationSupport.kt
index 2dc7382bf16..b07eea33676 100644
--- a/java/kotlin-extractor2/src/main/kotlin/MetaAnnotationSupport.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/MetaAnnotationSupport.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.versions.copyParameterToFunction
 import com.github.codeql.utils.versions.createImplicitParameterDeclarationWithWrappedDescriptor
 import com.github.codeql.utils.versions.getAnnotationType
@@ -511,3 +513,4 @@ class MetaAnnotationSupport(
             generateDocumentedAnnotation(c)
         )
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/PrimitiveTypeInfo.kt b/java/kotlin-extractor2/src/main/kotlin/PrimitiveTypeInfo.kt
index 225fe8509dd..8d5691fe9a4 100644
--- a/java/kotlin-extractor2/src/main/kotlin/PrimitiveTypeInfo.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/PrimitiveTypeInfo.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.*
 import com.github.codeql.utils.versions.*
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
@@ -103,3 +105,4 @@ class PrimitiveTypeMapping(val logger: Logger, val pluginContext: IrPluginContex
             )
         }()
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
index da04893b4d0..e5e25b0295f 100644
--- a/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/TrapWriter.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.KotlinUsesExtractor.LocallyVisibleFunctionLabels
 import com.semmle.extractor.java.PopulateFile
 import com.semmle.util.unicode.UTF8Util
@@ -462,3 +464,4 @@ class SourceFileTrapWriter(
         return "file://$filePath:$startLine:$startColumn:$endLine:$endColumn"
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractor.kt b/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractor.kt
index 0c6308acd99..08ed11afd62 100644
--- a/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractor.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.comments
 
+/*
+OLD: KE1
 import com.github.codeql.*
 import com.github.codeql.utils.isLocalFunction
 import org.jetbrains.kotlin.ir.IrElement
@@ -95,3 +97,4 @@ open class CommentExtractor(
         }
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractorPSI.kt b/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractorPSI.kt
index 3ca5dc45554..5e31dc108b8 100644
--- a/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractorPSI.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/comments/CommentExtractorPSI.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.comments
 
+/*
+OLD: KE1
 import com.github.codeql.*
 import com.github.codeql.utils.IrVisitorLookup
 import com.github.codeql.utils.Psi2IrFacade
@@ -120,3 +122,4 @@ class CommentExtractorPSI(
             }
         }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/comments/CommentType.kt b/java/kotlin-extractor2/src/main/kotlin/comments/CommentType.kt
index 1a1cec1aac2..bfb87b1fd44 100644
--- a/java/kotlin-extractor2/src/main/kotlin/comments/CommentType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/comments/CommentType.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.comments
 
+/*
+OLD: KE1
 enum class CommentType(val value: Int) {
     SingleLine(1),
     Block(2),
     Doc(3)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/AutoCloseableUse.kt b/java/kotlin-extractor2/src/main/kotlin/utils/AutoCloseableUse.kt
index 7883d04b8e4..363afdf82d4 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/AutoCloseableUse.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/AutoCloseableUse.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 // Functions copied from stdlib/jdk7/src/kotlin/AutoCloseable.kt, which is not available within
 // kotlinc,
 // but allows the `.use` pattern to be applied to JDK7 AutoCloseables:
@@ -45,3 +47,4 @@ fun AutoCloseable?.closeFinallyAC(cause: Throwable?) =
                 cause.addSuppressed(closeException)
             }
     }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/ClassNames.kt b/java/kotlin-extractor2/src/main/kotlin/utils/ClassNames.kt
index 54373933b84..eeebaf1480c 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/ClassNames.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/ClassNames.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.getJvmName
 import com.github.codeql.utils.versions.*
 import com.intellij.openapi.vfs.StandardFileSystems
@@ -148,3 +150,4 @@ private fun getUnknownBinaryLocation(s: String): String {
 
 fun getJavaEquivalentClassId(c: IrClass) =
     c.fqNameWhenAvailable?.toUnsafe()?.let { JavaToKotlinClassMap.mapKotlinToJava(it) }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/ExternalDecls.kt b/java/kotlin-extractor2/src/main/kotlin/utils/ExternalDecls.kt
index 01464efedc1..299ff7f3358 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/ExternalDecls.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/ExternalDecls.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
@@ -54,3 +56,4 @@ fun isExternalFileClassMember(d: IrDeclaration): Boolean {
     }
     return false
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/GetByFqName.kt b/java/kotlin-extractor2/src/main/kotlin/utils/GetByFqName.kt
index a3f5bb80a48..28772d26408 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/GetByFqName.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/GetByFqName.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.name.FqName
@@ -24,3 +26,4 @@ fun getPropertiesByFqName(
 ): Collection<IrPropertySymbol> {
     return getPropertiesByFqName(pluginContext, FqName(pkgName), Name.identifier(name))
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Helpers.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Helpers.kt
index aee909b1eb4..1f08a14d617 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/Helpers.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/Helpers.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -11,3 +13,4 @@ fun IrFunction.isLocalFunction(): Boolean {
 
 val IrClass.isInterfaceLike
     get() = kind == ClassKind.INTERFACE || kind == ClassKind.ANNOTATION_CLASS
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/IrVisitorLookup.kt b/java/kotlin-extractor2/src/main/kotlin/utils/IrVisitorLookup.kt
index 2ac55ee7ede..496208da372 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/IrVisitorLookup.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/IrVisitorLookup.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
@@ -38,3 +40,4 @@ class IrVisitorLookup(
         element.acceptChildren(this, data)
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Iterable.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Iterable.kt
index 890ad7c04b9..19d78df32cc 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/Iterable.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/Iterable.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 
 /**
@@ -11,3 +13,4 @@ inline fun <reified S : IrDeclaration> Iterable<IrDeclaration>.findSubType(
 ): S? {
     return this.find { it is S && predicate(it) } as S?
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/JvmNames.kt b/java/kotlin-extractor2/src/main/kotlin/utils/JvmNames.kt
index b6b51fde543..84f038172de 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/JvmNames.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/JvmNames.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import com.github.codeql.utils.versions.allOverriddenIncludingSelf
 import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
@@ -93,3 +95,4 @@ fun getJvmName(container: IrAnnotationContainer): String? {
     }
     return (container as? IrFunction)?.let { getSpecialJvmName(container) }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/List.kt b/java/kotlin-extractor2/src/main/kotlin/utils/List.kt
index 3ee6e243c76..cb065e876dc 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/List.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/List.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 /**
  * Turns this list of nullable elements into a list of non-nullable elements if they are all
  * non-null, or returns null otherwise.
@@ -11,3 +13,4 @@ public fun <T : Any> List<T?>.requireNoNullsOrNull(): List<T>? {
         return null
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Location.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Location.kt
index 31b3a365816..f9209d6e908 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/Location.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/Location.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
@@ -22,3 +24,4 @@ fun IrElement.getLocation(): Location {
 fun PsiElement.getLocation(): Location {
     return Location(this.startOffset, this.endOffset)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt
index 955a34feb1f..6b3ab1ea4dd 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/Logger.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import java.io.File
 import java.io.FileWriter
 import java.io.OutputStreamWriter
@@ -354,3 +356,4 @@ class FileLogger(loggerBase: LoggerBase, val ftw: FileTrapWriter) :
         )
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/Psi2IrFacade.kt b/java/kotlin-extractor2/src/main/kotlin/utils/Psi2IrFacade.kt
index f623efe2c85..ad966416fcc 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/Psi2IrFacade.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/Psi2IrFacade.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrFile
@@ -10,3 +12,4 @@ interface Psi2IrFacade {
 
     fun findPsiElement(irElement: IrElement, irFile: IrFile): PsiElement?
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/TypeResults.kt b/java/kotlin-extractor2/src/main/kotlin/utils/TypeResults.kt
index ee705bd9ae8..d81e1e04b20 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/TypeResults.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/TypeResults.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 /**
  * A triple of a type's database label, its signature for use in callable signatures, and its short
  * name for use in all tables that provide a user-facing type name.
@@ -38,3 +40,4 @@ typealias TypeResultsWithoutSignatures = TypeResultsGeneric<Unit>
 fun <T : AnyDbType> TypeResult<T>.forgetSignature(): TypeResultWithoutSignature<T> {
     return TypeResultWithoutSignature(this.id, Unit, this.shortName)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/TypeSubstitution.kt b/java/kotlin-extractor2/src/main/kotlin/utils/TypeSubstitution.kt
index 91cd5ec9f13..b6d88d7ae36 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/TypeSubstitution.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/TypeSubstitution.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import com.github.codeql.KotlinUsesExtractor
 import com.github.codeql.Logger
 import com.github.codeql.getJavaEquivalentClassId
@@ -281,3 +283,4 @@ private fun isUnspecialised(
 fun isUnspecialised(type: IrSimpleType, logger: Logger) =
     (type.classifier.owner as? IrClass)?.let { isUnspecialised(it, type.arguments, logger) }
         ?: false
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt
index 59fb1d18d14..c0ca853b803 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/CommentExtractorLighterAST.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.comments
 
+/*
+OLD: KE1
 import com.github.codeql.*
 import org.jetbrains.kotlin.ir.declarations.*
 
@@ -13,3 +15,4 @@ class CommentExtractorLighterAST(
         return false
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt
index 9b40a26bc51..89931170e48 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ExperimentalCompilerApi.kt
@@ -1,4 +1,7 @@
 package org.jetbrains.kotlin.compiler.plugin
 
+/*
+OLD: KE1
 @RequiresOptIn("This API is experimental. There are no stability guarantees for it")
 annotation class ExperimentalCompilerApi
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
index 43597b1158c..43cb374565d 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.SourceManager
 
 typealias FileEntry = SourceManager.FileEntry
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FirMetadataSourceFirFile.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FirMetadataSourceFirFile.kt
deleted file mode 100644
index 9c103006099..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/FirMetadataSourceFirFile.kt
+++ /dev/null
@@ -1 +0,0 @@
-// Nothing to do
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
index 2fd45e905d9..ebac6c86836 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt
@@ -1,8 +1,11 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.declarations.IrClass
 
 fun functionN(pluginContext: IrPluginContext): (Int) -> IrClass {
     return { i -> pluginContext.irBuiltIns.functionFactory.functionN(i) }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt
index 47d11ede1f2..babd1bc0435 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IrSymbolInternals.kt
@@ -1,3 +1,6 @@
 package org.jetbrains.kotlin.ir.symbols
 
+/*
+OLD: KE1
 @RequiresOptIn(level = RequiresOptIn.Level.WARNING) annotation class IrSymbolInternals
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt
index cb0fae2555b..00d3a44d14d 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/IsUnderscoreParameter.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.psi.KtParameter
@@ -19,3 +21,4 @@ fun isUnderscoreParameter(vp: IrValueParameter) =
         // be applied to synthetic functions.
         false
     }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JavaBinarySourceElement.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JavaBinarySourceElement.kt
index 71b45fa3cbb..6bae6ca0ec7 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JavaBinarySourceElement.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JavaBinarySourceElement.kt
@@ -1,5 +1,7 @@
 package org.jetbrains.kotlin.fir.java
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.load.java.structure.impl.classFiles.BinaryJavaClass
 
@@ -9,3 +11,4 @@ instance of it.
 */
 abstract class JavaBinarySourceElement private constructor(val javaClass: BinaryJavaClass) :
     SourceElement {}
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JvmDefaultModeEnabled.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JvmDefaultModeEnabled.kt
index cd849652613..3ba87fb38a3 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JvmDefaultModeEnabled.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/JvmDefaultModeEnabled.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.config.JvmDefaultMode
 
 fun jvmDefaultModeEnabledIsEnabled(jdm: JvmDefaultMode): Boolean {
     return jdm.forAllMethodsWithBody
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt
index 84c5fc3bfb6..76958b1c960 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Kotlin2ComponentRegistrar.kt
@@ -3,6 +3,8 @@
 
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 
@@ -10,3 +12,4 @@ import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
     /* Nothing to do; supportsK2 doesn't exist yet. */
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/LinesOfCodeLighterAST.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/LinesOfCodeLighterAST.kt
index dbda9084a9d..564568ec06a 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/LinesOfCodeLighterAST.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/LinesOfCodeLighterAST.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.*
 
 class LinesOfCodeLighterAST(val logger: FileLogger, val tw: FileTrapWriter, val file: IrFile) {
@@ -16,3 +18,4 @@ class LinesOfCodeLighterAST(val logger: FileLogger, val tw: FileTrapWriter, val
         return false
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
index 2046b507bf8..7a5f89f4c4a 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import com.github.codeql.utils.Psi2IrFacade
 
 fun getPsi2Ir(): Psi2IrFacade? = null
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
index 22e49c97444..90830ed6cfa 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/ReferenceEntity.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.name.ClassId
@@ -31,3 +33,4 @@ fun getPropertiesByFqName(
     val fqName = pkgName.child(name)
     return pluginContext.referenceProperties(fqName)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt
index 2d71b430c9f..170b5818244 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/SyntheticBodyKind.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.expressions.IrSyntheticBodyKind
 
 val kind_ENUM_ENTRIES: IrSyntheticBodyKind? = null
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Types.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
index 630d649907c..10fa6e45088 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/Types.kt
@@ -1,6 +1,9 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.jvm.codegen.isRawType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
 fun IrSimpleType.isRawType() = this.isRawType()
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt
index 39219d77730..040b11bb231 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/UsesK2.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 
 fun usesK2(@Suppress("UNUSED_PARAMETER") pluginContext: IrPluginContext): Boolean {
     return false
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt
index 24ac7e40f48..03b3684bc4b 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/allOverriddenIncludingSelf.kt
@@ -1,6 +1,9 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.ir.allOverridden
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 
 fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
index d4e2f17430f..afdd5c0da80 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt
@@ -1,8 +1,11 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
 
 @OptIn(ObsoleteDescriptorBasedAPI::class)
 fun getAnnotationType(context: IrPluginContext) =
     context.typeTranslator.translateType(context.builtIns.annotationType)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt
index a0d46acc56e..1509c2b7d2f 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/copyTo.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.ir.copyTo
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 
 fun copyParameterToFunction(p: IrValueParameter, f: IrFunction) = p.copyTo(f)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt
index 36016980af1..1ae51fce5d8 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/createImplicitParameterDeclarationWithWrappedDescriptor.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.ir.createImplicitParameterDeclarationWithWrappedDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrClass
 
 fun IrClass.createImplicitParameterDeclarationWithWrappedDescriptor() =
     this.createImplicitParameterDeclarationWithWrappedDescriptor()
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt
index 4400589ae34..8abd994e413 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getFileClassFqName.kt
@@ -1,8 +1,11 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.name.FqName
 
 fun getFileClassFqName(@Suppress("UNUSED_PARAMETER") d: IrDeclaration): FqName? {
     return null
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt
index 3f21550f13f..b517220b3f8 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/getKotlinType.kt
@@ -1,6 +1,9 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 import org.jetbrains.kotlin.ir.types.impl.IrTypeBase
 
 fun getKotlinType(s: IrSimpleType) = (s as? IrTypeBase)?.kotlinType
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt
index 87e67cd8368..e7723a438df 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/packageFqName.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.name.FqName
 
@@ -8,3 +10,4 @@ val IrFile.packageFqName: FqName
 
 val IrPackageFragment.packageFqName: FqName
     get() = this.fqName
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/parents.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/parents.kt
index d30fb104c03..892941b926e 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/parents.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/parents.kt
@@ -1,5 +1,7 @@
 package org.jetbrains.kotlin.ir.util
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.lower.parents as kParents
 import org.jetbrains.kotlin.backend.common.lower.parentsWithSelf as kParentsWithSelf
 import org.jetbrains.kotlin.ir.declarations.*
@@ -9,3 +11,4 @@ val IrDeclaration.parents: Sequence<IrDeclarationParent>
 
 val IrDeclaration.parentsWithSelf: Sequence<IrDeclarationParent>
     get() = this.kParentsWithSelf
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt
index 114391ae6bf..4732766f0a1 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_0/withHasQuestionMark.kt
@@ -1,8 +1,11 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.withHasQuestionMark
 
 fun IrType.codeQlWithHasQuestionMark(b: Boolean): IrType {
     return this.withHasQuestionMark(b)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
index 18308780bff..1ad17c34636 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.IrFileEntry
 
 typealias FileEntry = IrFileEntry
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
index 6bd99e06ef2..1c0d0b70614 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import com.github.codeql.utils.Psi2IrFacade
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.backend.common.psi.PsiSourceManager
@@ -19,3 +21,4 @@ private class Psi2Ir() : Psi2IrFacade {
         return PsiSourceManager.findPsiElement(irElement, irFile)
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
index 7d6c3eda8c3..4a1b4641360 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 
 fun functionN(pluginContext: IrPluginContext) = pluginContext.irBuiltIns::functionN
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt
index d51db5eb05c..990e9961fac 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_0/annotationType.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 
 fun getAnnotationType(context: IrPluginContext) = context.irBuiltIns.annotationType
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/IsUnderscoreParameter.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/IsUnderscoreParameter.kt
index d727126ffc4..552a6f328ba 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/IsUnderscoreParameter.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/IsUnderscoreParameter.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 
 fun isUnderscoreParameter(vp: IrValueParameter) =
     vp.origin == IrDeclarationOrigin.UNDERSCORE_PARAMETER
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/Types.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
index d44e4407400..75ec0966e74 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_6_20/Types.kt
@@ -1,6 +1,9 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.jvm.ir.isRawType
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
 fun IrSimpleType.isRawType() = this.isRawType()
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getFileClassFqName.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getFileClassFqName.kt
index 82275ba0342..cd486ab9f71 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getFileClassFqName.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getFileClassFqName.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrDeclaration
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrMemberWithContainerSource
@@ -39,3 +41,4 @@ fun getFileClassFqName(d: IrDeclaration): FqName? {
         return null
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getKotlinType.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getKotlinType.kt
index 2f53392fba1..2793e8a8e95 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getKotlinType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/getKotlinType.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
 fun getKotlinType(s: IrSimpleType) = s.kotlinType
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/withHasQuestionMark.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/withHasQuestionMark.kt
index f4e171f8fb2..55d3598b38e 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/withHasQuestionMark.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_0/withHasQuestionMark.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.makeNotNull
 import org.jetbrains.kotlin.ir.types.makeNullable
@@ -11,3 +13,4 @@ fun IrType.codeQlWithHasQuestionMark(b: Boolean): IrType {
         return this.makeNotNull()
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/allOverriddenIncludingSelf.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/allOverriddenIncludingSelf.kt
index 2d33930ecbc..2f0b0ff0165 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/allOverriddenIncludingSelf.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/allOverriddenIncludingSelf.kt
@@ -1,6 +1,9 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.util.allOverridden
 
 fun IrSimpleFunction.allOverriddenIncludingSelf() = this.allOverridden(includeSelf = true)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/copyTo.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/copyTo.kt
index a68e9343247..0b1eae0cc2f 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/copyTo.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/copyTo.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.kotlin.ir.declarations.IrValueParameter
 import org.jetbrains.kotlin.ir.util.copyTo
 
 fun copyParameterToFunction(p: IrValueParameter, f: IrFunction) = p.copyTo(f)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/createImplicitParameterDeclarationWithWrappedDescriptor.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/createImplicitParameterDeclarationWithWrappedDescriptor.kt
index f262ff226a0..1bc75d0e944 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/createImplicitParameterDeclarationWithWrappedDescriptor.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_7_20/createImplicitParameterDeclarationWithWrappedDescriptor.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.declarations.IrClass
 import org.jetbrains.kotlin.ir.util.createImplicitParameterDeclarationWithWrappedDescriptor
 
 fun IrClass.createImplicitParameterDeclarationWithWrappedDescriptor() =
     this.createImplicitParameterDeclarationWithWrappedDescriptor()
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ExperimentalCompilerApi.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ExperimentalCompilerApi.kt
deleted file mode 100644
index 48829cc30c5..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ExperimentalCompilerApi.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.codeql
-
-// The compiler provides the annotation class, so we don't need to do
-// anything
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
index 666e4e38386..97858e91b20 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/ReferenceEntity.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 import org.jetbrains.kotlin.ir.symbols.*
 import org.jetbrains.kotlin.name.CallableId
@@ -33,3 +35,4 @@ fun getPropertiesByFqName(
     val id = CallableId(pkgName, name)
     return pluginContext.referenceProperties(id)
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/SyntheticBodyKind.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/SyntheticBodyKind.kt
index 4c654282ca7..aecddf8681d 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/SyntheticBodyKind.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_8_0/SyntheticBodyKind.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.expressions.IrSyntheticBodyKind
 
 val kind_ENUM_ENTRIES: IrSyntheticBodyKind? = IrSyntheticBodyKind.ENUM_ENTRIES
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/CommentExtractorLighterAST.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/CommentExtractorLighterAST.kt
index ecaa5e23287..a12e5610ec2 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/CommentExtractorLighterAST.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/CommentExtractorLighterAST.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.comments
 
+/*
+OLD: KE1
 import com.github.codeql.*
 import com.github.codeql.utils.versions.*
 import com.intellij.lang.LighterASTNode
@@ -129,3 +131,4 @@ class CommentExtractorLighterAST(
         }
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/FirMetadataSourceFirFile.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/FirMetadataSourceFirFile.kt
index 53fefb30817..cbef9b71dd3 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/FirMetadataSourceFirFile.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/FirMetadataSourceFirFile.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
 import org.jetbrains.kotlin.fir.declarations.FirFile
 
 val FirMetadataSource.File.firFile: FirFile?
     get() = this.files.elementAtOrNull(0)
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt
index 323d8e2c283..3327f6454f0 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/Kotlin2ComponentRegistrar.kt
@@ -3,6 +3,8 @@
 
 package com.github.codeql
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 
@@ -11,3 +13,4 @@ abstract class Kotlin2ComponentRegistrar : ComponentRegistrar {
     override val supportsK2: Boolean
         get() = true
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/LinesOfCodeLighterAST.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/LinesOfCodeLighterAST.kt
index 82357d9dfbd..24d9574a16f 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/LinesOfCodeLighterAST.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/LinesOfCodeLighterAST.kt
@@ -1,5 +1,7 @@
 package com.github.codeql
 
+/*
+OLD: KE1
 import com.github.codeql.utils.versions.*
 import com.intellij.lang.LighterASTNode
 import com.intellij.util.diff.FlyweightCapableTreeStructure
@@ -146,3 +148,4 @@ class LinesOfCodeLighterAST(val logger: FileLogger, val tw: FileTrapWriter, val
         var containsCode = false
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/UsesK2.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/UsesK2.kt
index 8d5e3345565..181d3e26276 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/UsesK2.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_0-Beta/UsesK2.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
 
 fun usesK2(pluginContext: IrPluginContext): Boolean {
     return pluginContext.languageVersionSettings.languageVersion.usesK2
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_20-Beta/packageFqName.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_20-Beta/packageFqName.kt
deleted file mode 100644
index 613d51c7cbf..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_1_9_20-Beta/packageFqName.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.github.codeql
-
-// The compiler provides packageFqName, so we don't need to do anything
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/FirMetadataSourceFirFile.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/FirMetadataSourceFirFile.kt
index dc47af858b2..aac2d6a5f3f 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/FirMetadataSourceFirFile.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/FirMetadataSourceFirFile.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.fir.backend.FirMetadataSource
 import org.jetbrains.kotlin.fir.declarations.FirFile
 
 val FirMetadataSource.File.firFile: FirFile?
     get() = this.fir
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/IrSymbolInternals.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/IrSymbolInternals.kt
deleted file mode 100644
index 48829cc30c5..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/IrSymbolInternals.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.codeql
-
-// The compiler provides the annotation class, so we don't need to do
-// anything
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JavaBinarySourceElement.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JavaBinarySourceElement.kt
deleted file mode 100644
index 80167cbcc8f..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JavaBinarySourceElement.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-The compiler provides this class, so we don't have to do anything.
-*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JvmDefaultModeEnabled.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JvmDefaultModeEnabled.kt
index 10a936ed909..b2dddca9223 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JvmDefaultModeEnabled.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/JvmDefaultModeEnabled.kt
@@ -1,7 +1,10 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.config.JvmDefaultMode
 
 fun jvmDefaultModeEnabledIsEnabled(jdm: JvmDefaultMode): Boolean {
     return jdm.isEnabled
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/Psi2Ir.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/Psi2Ir.kt
index 09c4f42e021..3cd08bc2135 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/Psi2Ir.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/Psi2Ir.kt
@@ -1,5 +1,7 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import com.github.codeql.utils.Psi2IrFacade
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.ir.PsiSourceManager
@@ -19,3 +21,4 @@ private class Psi2Ir() : Psi2IrFacade {
         return PsiSourceManager.findPsiElement(irElement, irFile)
     }
 }
+*/
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/parents.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/parents.kt
deleted file mode 100644
index 9c103006099..00000000000
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_0-RC1/parents.kt
+++ /dev/null
@@ -1 +0,0 @@
-// Nothing to do
diff --git a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_20-Beta2/getKotlinType.kt b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_20-Beta2/getKotlinType.kt
index 37fb2a70041..1112b5a0a70 100644
--- a/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_20-Beta2/getKotlinType.kt
+++ b/java/kotlin-extractor2/src/main/kotlin/utils/versions/v_2_0_20-Beta2/getKotlinType.kt
@@ -1,5 +1,8 @@
 package com.github.codeql.utils.versions
 
+/*
+OLD: KE1
 import org.jetbrains.kotlin.ir.types.IrSimpleType
 
 fun getKotlinType(s: IrSimpleType) = s.originalKotlinType
+*/