diff --git a/.changes/next-release/removal-dc421992-1194-47de-9908-930d70687453.json b/.changes/next-release/removal-dc421992-1194-47de-9908-930d70687453.json
new file mode 100644
index 00000000000..d39c790cccf
--- /dev/null
+++ b/.changes/next-release/removal-dc421992-1194-47de-9908-930d70687453.json
@@ -0,0 +1,4 @@
+{
+  "type" : "removal",
+  "description" : "/transform: remove option to receive multiple diffs"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
index ab4af2a8d4c..ae67e5a42a1 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -30,9 +30,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESH
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_EXPIRED
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.getDownloadedArtifactTextFromType
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.viewSummaryButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatHelper
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.messages.CodeTransformChatMessageType
@@ -43,14 +41,12 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArt
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ParseZipFailureReason
-import software.aws.toolkits.jetbrains.services.codemodernizer.model.PatchInfo
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.UnzipFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactDir
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCodeTransformConnection
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.openTroubleshootingGuideNotificationAction
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.zipToPath
-import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
 import software.aws.toolkits.resources.message
@@ -63,20 +59,6 @@ import java.util.concurrent.atomic.AtomicBoolean
 const val DOWNLOAD_PROXY_WILDCARD_ERROR: String = "Dangling meta character '*' near index 0"
 const val DOWNLOAD_SSL_HANDSHAKE_ERROR: String = "Unable to execute HTTP request: javax.net.ssl.SSLHandshakeException"
 const val INVALID_ARTIFACT_ERROR: String = "Invalid artifact"
-val patchDescriptions = mapOf(
-    "Prepare minimal upgrade to Java 17" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks in Java 17.",
-    "Prepare minimal upgrade to Java 21" to "This diff patch covers the set of upgrades for Springboot, JUnit, and PowerMockito frameworks in Java 21.",
-    "Popular Enterprise Specifications and Application Frameworks upgrade" to "This diff patch covers the set of upgrades for Jakarta EE 10, Hibernate 6.2, " +
-        "and Micronaut 3.",
-    "HTTP Client Utilities, Apache Commons Utilities, and Web Frameworks" to "This diff patch covers the set of upgrades for Apache HTTP Client 5, Apache " +
-        "Commons utilities (Collections, IO, Lang, Math), and Struts 6.0.",
-    "Testing Tools and Frameworks upgrade" to "This diff patch covers the set of upgrades for ArchUnit, Mockito, TestContainers, and Cucumber, in addition " +
-        "to the Jenkins plugins and the Maven Wrapper.",
-    "Miscellaneous Processing Documentation upgrade" to "This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, " +
-        "and more.",
-    "Deprecated API replacement, dependency upgrades, and formatting" to "This diff patch replaces deprecated APIs, makes additional dependency version " +
-        "upgrades, and formats code changes."
-)
 
 class ArtifactHandler(
     private val project: Project,
@@ -88,21 +70,13 @@ class ArtifactHandler(
     private val downloadedSummaries = mutableMapOf<JobId, TransformationSummary>()
     private val downloadedBuildLogPath = mutableMapOf<JobId, Path>()
     private var isCurrentlyDownloading = AtomicBoolean(false)
-    private var totalPatchFiles: Int = 0
-    private var sharedPatchIndex: Int = 0
 
     internal suspend fun displayDiff(job: JobId) {
         if (isCurrentlyDownloading.get()) return
         when (val result = downloadArtifact(job, TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS)) {
             is DownloadArtifactResult.Success -> {
                 if (result.artifact !is CodeModernizerArtifact) return notifyUnableToApplyPatch("")
-                totalPatchFiles = result.artifact.patches.size
-                if (result.artifact.description == null) {
-                    displayDiffUsingPatch(result.artifact.patches.first(), totalPatchFiles, null, job)
-                } else {
-                    val diffDescription = result.artifact.description[getCurrentPatchIndex()]
-                    displayDiffUsingPatch(result.artifact.patches[getCurrentPatchIndex()], totalPatchFiles, diffDescription, job)
-                }
+                displayDiffUsingPatch(result.artifact.patch, job)
             }
             is DownloadArtifactResult.ParseZipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage)
             is DownloadArtifactResult.UnzipFailure -> notifyUnableToApplyPatch(result.failureReason.errorMessage)
@@ -260,8 +234,6 @@ class ArtifactHandler(
      */
     internal suspend fun displayDiffUsingPatch(
         patchFile: VirtualFile,
-        totalPatchFiles: Int,
-        diffDescription: PatchInfo?,
         jobId: JobId,
     ) {
         withContext(EDT) {
@@ -274,11 +246,7 @@ class ArtifactHandler(
                 null,
                 ChangeListManager.getInstance(project)
                     .addChangeList(
-                        if (diffDescription != null) {
-                            "${diffDescription.name} (${if (diffDescription.isSuccessful) "Success" else "Failure"})"
-                        } else {
-                            patchFile.name
-                        },
+                        patchFile.name,
                         ""
                     ),
                 null,
@@ -289,42 +257,12 @@ class ArtifactHandler(
             dialog.isModal = true
 
             if (dialog.showAndGet()) {
-                telemetry.submitSelection("Submit-${diffDescription?.name}", jobId.toString())
-                if (diffDescription == null) {
-                    val resultContent = CodeTransformChatMessageContent(
-                        type = CodeTransformChatMessageType.PendingAnswer,
-                        message = message("codemodernizer.chat.message.changes_applied"),
-                    )
-                    codeTransformChatHelper?.updateLastPendingMessage(resultContent)
-                } else {
-                    if (getCurrentPatchIndex() < totalPatchFiles) {
-                        val message = "I applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles. " +
-                            "${patchDescriptions[diffDescription.name]}"
-                        val notificationMessage = "Amazon Q applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles " +
-                            "to your project."
-                        val notificationTitle = "Diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles applied"
-                        setCurrentPatchIndex(getCurrentPatchIndex() + 1)
-                        notifyInfo(notificationTitle, notificationMessage, project)
-                        if (getCurrentPatchIndex() == totalPatchFiles) {
-                            codeTransformChatHelper?.updateLastPendingMessage(
-                                CodeTransformChatMessageContent(type = CodeTransformChatMessageType.PendingAnswer, message = message)
-                            )
-                        } else {
-                            codeTransformChatHelper?.updateLastPendingMessage(
-                                CodeTransformChatMessageContent(
-                                    type = CodeTransformChatMessageType.PendingAnswer,
-                                    message = message,
-                                    buttons = listOf(
-                                        createViewDiffButton("View diff ${getCurrentPatchIndex() + 1}/$totalPatchFiles"),
-                                        viewSummaryButton
-                                    )
-                                )
-                            )
-                        }
-                    } else {
-                        // no-op; start a new transformation button already visible at this point
-                    }
-                }
+                telemetry.submitSelection("Submit", jobId.toString())
+                val resultContent = CodeTransformChatMessageContent(
+                    type = CodeTransformChatMessageType.PendingAnswer,
+                    message = message("codemodernizer.chat.message.changes_applied"),
+                )
+                codeTransformChatHelper?.updateLastPendingMessage(resultContent)
             } else {
                 telemetry.submitSelection("Cancel", jobId.toString())
             }
@@ -411,7 +349,7 @@ class ArtifactHandler(
         ),
     )
 
-    fun notifyUnableToShowSummary() {
+    private fun notifyUnableToShowSummary() {
         LOG.error { "Unable to display summary" }
         notifyStickyWarn(
             message("codemodernizer.notification.warn.view_summary_failed.title"),
@@ -425,7 +363,7 @@ class ArtifactHandler(
         )
     }
 
-    fun notifyUnableToShowBuildLog() {
+    private fun notifyUnableToShowBuildLog() {
         LOG.error { "Unable to display build log" }
         notifyStickyWarn(
             message("codemodernizer.notification.warn.view_build_log_failed.title"),
@@ -447,12 +385,6 @@ class ArtifactHandler(
 
     fun getSummary(job: JobId) = downloadedSummaries[job]
 
-    private fun getCurrentPatchIndex() = sharedPatchIndex
-
-    private fun setCurrentPatchIndex(index: Int) {
-        sharedPatchIndex = index
-    }
-
     private fun showSummaryFromFile(summaryFile: File) {
         val summaryMarkdownVirtualFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(summaryFile)
         if (summaryMarkdownVirtualFile != null) {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
index b1ff57d6c8d..d468097d255 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
@@ -72,7 +72,6 @@ import javax.net.ssl.SSLHandshakeException
 
 const val MAX_ZIP_SIZE = 2000000000 // 2GB
 const val EXPLAINABILITY_V1 = "EXPLAINABILITY_V1"
-const val SELECTIVE_TRANSFORMATION_V1 = "SELECTIVE_TRANSFORMATION_V1"
 
 // constants for handling SDKClientException
 const val CONNECTION_REFUSED_ERROR: String = "Connection refused"
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
index edbf0afa7be..aba84e640fb 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt
@@ -47,7 +47,6 @@ private enum class CodeTransformMessageTypes(val type: String) {
     CodeTransformCancel("codetransform-cancel"),
     CodeTransformContinue("codetransform-continue"),
     CodeTransformConfirmSkipTests("codetransform-confirm-skip-tests"),
-    CodeTransformConfirmOneOrMultipleDiffs("codetransform-confirm-one-or-multiple-diffs"),
     CodeTransformNew("codetransform-new"),
     CodeTransformOpenTransformHub("codetransform-open-transform-hub"),
     CodeTransformOpenMvnBuild("codetransform-open-mvn-build"),
@@ -84,7 +83,6 @@ class CodeTransformChatApp : AmazonQApp {
             CodeTransformMessageTypes.CodeTransformContinue.type to IncomingCodeTransformMessage.CodeTransformContinue::class,
             CodeTransformMessageTypes.ChatPrompt.type to IncomingCodeTransformMessage.ChatPrompt::class,
             CodeTransformMessageTypes.CodeTransformConfirmSkipTests.type to IncomingCodeTransformMessage.CodeTransformConfirmSkipTests::class,
-            CodeTransformMessageTypes.CodeTransformConfirmOneOrMultipleDiffs.type to IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs::class,
             CodeTransformMessageTypes.CodeTransformNew.type to IncomingCodeTransformMessage.CodeTransformNew::class,
             CodeTransformMessageTypes.CodeTransformOpenTransformHub.type to IncomingCodeTransformMessage.CodeTransformOpenTransformHub::class,
             CodeTransformMessageTypes.CodeTransformOpenMvnBuild.type to IncomingCodeTransformMessage.CodeTransformOpenMvnBuild::class,
@@ -193,7 +191,6 @@ class CodeTransformChatApp : AmazonQApp {
             is IncomingCodeTransformMessage.CodeTransformStop -> inboundAppMessagesHandler.processCodeTransformStopAction(message.tabId)
             is IncomingCodeTransformMessage.ChatPrompt -> inboundAppMessagesHandler.processChatPromptMessage(message)
             is IncomingCodeTransformMessage.CodeTransformConfirmSkipTests -> inboundAppMessagesHandler.processCodeTransformConfirmSkipTests(message)
-            is IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs -> inboundAppMessagesHandler.processCodeTransformOneOrMultipleDiffs(message)
             is IncomingCodeTransformMessage.CodeTransformContinue -> inboundAppMessagesHandler.processCodeTransformContinueAction(message)
             is IncomingCodeTransformMessage.CodeTransformNew -> inboundAppMessagesHandler.processCodeTransformNewAction(message)
             is IncomingCodeTransformMessage.CodeTransformOpenTransformHub -> inboundAppMessagesHandler.processCodeTransformOpenTransformHub(message)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt
index 434516178bd..e300b595a30 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/InboundAppMessagesHandler.kt
@@ -27,8 +27,6 @@ interface InboundAppMessagesHandler {
 
     suspend fun processCodeTransformConfirmSkipTests(message: IncomingCodeTransformMessage.CodeTransformConfirmSkipTests)
 
-    suspend fun processCodeTransformOneOrMultipleDiffs(message: IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs)
-
     suspend fun processCodeTransformOpenTransformHub(message: IncomingCodeTransformMessage.CodeTransformOpenTransformHub)
 
     suspend fun processCodeTransformOpenMvnBuild(message: IncomingCodeTransformMessage.CodeTransformOpenMvnBuild)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
index dc983f6e6d7..9baf422c500 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -80,13 +80,6 @@ private val confirmSkipTestsSelectionButton = Button(
     id = CodeTransformButtonId.ConfirmSkipTests.id,
 )
 
-private val confirmOneOrMultipleDiffsSelectionButton = Button(
-    keepCardAfterClick = false,
-    waitMandatoryFormItems = true,
-    text = message("codemodernizer.chat.message.button.confirm"),
-    id = CodeTransformButtonId.ConfirmOneOrMultipleDiffs.id,
-)
-
 private val confirmCustomDependencyVersionsButton = Button(
     keepCardAfterClick = true,
     waitMandatoryFormItems = true,
@@ -230,22 +223,6 @@ private val selectSkipTestsFlagFormItem = FormItem(
     )
 )
 
-private val selectOneOrMultipleDiffsFlagFormItem = FormItem(
-    id = CodeTransformFormItemId.SelectOneOrMultipleDiffsFlag.id,
-    title = message("codemodernizer.chat.form.user_selection.item.choose_one_or_multiple_diffs_option"),
-    mandatory = true,
-    options = listOf(
-        FormItemOption(
-            label = message("codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff"),
-            value = message("codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff"),
-        ),
-        FormItemOption(
-            label = message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs"),
-            value = message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs"),
-        )
-    )
-)
-
 private fun getUserLanguageUpgradeSelectionFormattedMarkdown(moduleName: String, targetJdkVersion: String): String = """
         ### ${message("codemodernizer.chat.prompt.title.details")}
         -------------
@@ -338,32 +315,12 @@ fun buildUserInputSkipTestsFlagChatContent(): CodeTransformChatMessageContent =
         formItems = listOf(selectSkipTestsFlagFormItem),
         type = CodeTransformChatMessageType.FinalizedAnswer,
     )
-fun buildUserInputOneOrMultipleDiffsChatIntroContent(version: String): CodeTransformChatMessageContent =
-    CodeTransformChatMessageContent(
-        message = message("codemodernizer.chat.message.one_or_multiple_diffs", version.substring(4)), // extract "17" / "21" from "JDK_17" / "JDK_21"
-        type = CodeTransformChatMessageType.FinalizedAnswer,
-    )
-fun buildUserInputOneOrMultipleDiffsFlagChatContent(): CodeTransformChatMessageContent =
-    CodeTransformChatMessageContent(
-        message = message("codemodernizer.chat.form.user_selection.title"),
-        buttons = listOf(
-            confirmOneOrMultipleDiffsSelectionButton,
-            cancelUserSelectionButton,
-        ),
-        formItems = listOf(selectOneOrMultipleDiffsFlagFormItem),
-        type = CodeTransformChatMessageType.FinalizedAnswer,
-    )
 
 fun buildUserSkipTestsFlagSelectionChatContent(skipTestsSelection: String) = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.FinalizedAnswer,
     message = message("codemodernizer.chat.message.skip_tests_form.response", skipTestsSelection.lowercase())
 )
 
-fun buildUserOneOrMultipleDiffsSelectionChatContent(oneOrMultipleDiffsSelection: String) = CodeTransformChatMessageContent(
-    type = CodeTransformChatMessageType.FinalizedAnswer,
-    message = message("codemodernizer.chat.message.one_or_multiple_diffs_form.response", oneOrMultipleDiffsSelection.lowercase())
-)
-
 fun buildUserInputLanguageUpgradeChatContent(project: Project, validationResult: ValidationResult): CodeTransformChatMessageContent {
     val moduleBuildFiles = validationResult.validatedBuildFiles
 
@@ -597,7 +554,7 @@ fun buildTransformResumingChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.PendingAnswer,
 )
 
-fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, totalPatchFiles: Int? = null): CodeTransformChatMessageContent {
+fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult): CodeTransformChatMessageContent {
     val resultMessage = when (result) {
         is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge -> {
             "${message(
@@ -611,18 +568,10 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, to
             buildZipUploadFailedChatMessage(result.failureReason)
         }
         is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> {
-            if (totalPatchFiles == 1) {
-                message("codemodernizer.chat.message.result.success")
-            } else {
-                message("codemodernizer.chat.message.result.success.multiple_diffs")
-            }
+            message("codemodernizer.chat.message.result.success")
         }
         is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> {
-            if (totalPatchFiles == 1) {
-                message("codemodernizer.chat.message.result.partially_success")
-            } else {
-                message("codemodernizer.chat.message.result.partially_success.multiple_diffs")
-            }
+            message("codemodernizer.chat.message.result.partially_success")
         }
         is CodeModernizerJobCompletedResult.JobFailed -> {
             message("codemodernizer.chat.message.result.fail_with_known_reason", result.failureReason)
@@ -649,7 +598,7 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, to
         type = CodeTransformChatMessageType.FinalizedAnswer,
         message = resultMessage,
         buttons = if (result is CodeModernizerJobCompletedResult.JobPartiallySucceeded || result is CodeModernizerJobCompletedResult.JobCompletedSuccessfully) {
-            listOf(createViewDiffButton(if (totalPatchFiles == 1) "View diff" else "View diff 1/$totalPatchFiles"), viewSummaryButton)
+            listOf(createViewDiffButton("View diff"), viewSummaryButton)
         } else if (result is CodeModernizerJobCompletedResult.JobFailedInitialBuild && result.hasBuildLog) {
             listOf(viewBuildLog)
         } else {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
index 7e1f17ce257..0ee07954037 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt
@@ -31,7 +31,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTele
 import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1
 import software.aws.toolkits.jetbrains.services.codemodernizer.HilTelemetryMetaData
 import software.aws.toolkits.jetbrains.services.codemodernizer.InboundAppMessagesHandler
-import software.aws.toolkits.jetbrains.services.codemodernizer.SELECTIVE_TRANSFORMATION_V1
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformCommand
@@ -77,13 +76,10 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildTr
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserCancelledChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserHilSelection
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputLanguageUpgradeChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsChatIntroContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputOneOrMultipleDiffsFlagChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSQLConversionMetadataChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserInputSkipTestsFlagChatIntroContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserLanguageUpgradeSelectionSummaryChatContent
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserOneOrMultipleDiffsSelectionChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserReplyChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSQLConversionSelectionSummaryChatContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildUserSkipTestsFlagSelectionChatContent
@@ -418,26 +414,8 @@ class CodeTransformChatController(
         codeModernizerManager.codeTransformationSession?.let {
             it.sessionContext.customBuildCommand = customBuildCommand
         }
-        val targetJdkVersion = codeModernizerManager.codeTransformationSession?.sessionContext?.targetJavaVersion?.name.orEmpty()
-        codeTransformChatHelper.run {
-            addNewMessage(buildUserInputOneOrMultipleDiffsChatIntroContent(targetJdkVersion))
-            addNewMessage(buildUserInputOneOrMultipleDiffsFlagChatContent())
-        }
-    }
-
-    override suspend fun processCodeTransformOneOrMultipleDiffs(message: IncomingCodeTransformMessage.CodeTransformConfirmOneOrMultipleDiffs) {
-        val transformCapabilities = when (message.oneOrMultipleDiffsSelection) {
-            // TODO: add CLIENT_SIDE_BUILD to both below when releasing CSB
-            message("codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs") -> listOf(
-                EXPLAINABILITY_V1,
-                SELECTIVE_TRANSFORMATION_V1
-            )
-            else -> listOf(
-                EXPLAINABILITY_V1,
-            )
-        }
-        telemetry.submitSelection(message.oneOrMultipleDiffsSelection)
-        codeTransformChatHelper.addNewMessage(buildUserOneOrMultipleDiffsSelectionChatContent(message.oneOrMultipleDiffsSelection))
+        // TODO: add CLIENT_SIDE_BUILD below when releasing CSB
+        val transformCapabilities = listOf(EXPLAINABILITY_V1)
         codeModernizerManager.codeTransformationSession?.let {
             it.sessionContext.transformCapabilities = transformCapabilities
             codeModernizerManager.runLocalMavenBuild(context.project, it)
@@ -819,7 +797,7 @@ dependencyManagement:
                         is DownloadArtifactResult.Success -> {
                             if (downloadResult.artifact !is CodeModernizerArtifact) return artifactHandler.notifyUnableToApplyPatch("")
                             codeTransformChatHelper.updateLastPendingMessage(
-                                buildTransformResultChatContent(result, downloadResult.artifact.patches.size)
+                                buildTransformResultChatContent(result)
                             )
                         }
                         is DownloadArtifactResult.DownloadFailure -> artifactHandler.notifyUnableToDownload(downloadResult.failureReason)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt
index b26fcbaeae2..66ad7d185d6 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/messages/CodeTransformMessage.kt
@@ -22,7 +22,6 @@ enum class CodeTransformButtonId(val id: String) {
     CancelTransformation("codetransform-input-cancel"),
     ContinueTransformation("codetransform-input-continue"),
     ConfirmSkipTests("codetransform-input-confirm-skip-tests"),
-    ConfirmOneOrMultipleDiffs("codetransform-input-confirm-one-or-multiple-diffs"),
     ConfirmCustomDependencyVersions("codetransform-input-confirm-custom-dependency-versions"),
     StopTransformation("stop_transform"),
     OpenTransformationHub("open_transformation_hub"),
@@ -40,7 +39,6 @@ enum class CodeTransformFormItemId(val id: String) {
     SelectSQLSchema("sqlSchema"),
     SelectTargetVersion("targetVersion"),
     SelectSkipTestsFlag("skipTestsSelection"),
-    SelectOneOrMultipleDiffsFlag("oneOrMultipleDiffsSelection"),
     DependencyVersion("dependencyVersion"),
 }
 
@@ -114,11 +112,6 @@ sealed interface IncomingCodeTransformMessage : CodeTransformBaseMessage {
         val skipTestsSelection: String,
     ) : IncomingCodeTransformMessage
 
-    data class CodeTransformConfirmOneOrMultipleDiffs(
-        @JsonProperty("tabID") val tabId: String,
-        val oneOrMultipleDiffsSelection: String,
-    ) : IncomingCodeTransformMessage
-
     data class CodeTransformConfirmCustomDependencyVersions(
         @JsonProperty("tabID") val tabId: String,
     ) : IncomingCodeTransformMessage
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt
index 86a39035691..aea9920f61a 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt
@@ -31,8 +31,7 @@ import kotlin.io.path.walk
 open class CodeModernizerArtifact(
     val zipPath: String,
     val manifest: CodeModernizerManifest,
-    val patches: List<VirtualFile>,
-    val description: List<PatchInfo>?,
+    val patch: VirtualFile,
     val summary: TransformationSummary,
     val summaryMarkdownFile: File,
     val metrics: CodeModernizerMetrics?,
@@ -65,12 +64,11 @@ open class CodeModernizerArtifact(
                     // If not supported we can still try to use it, i.e. the versions should largely be backwards compatible
                     LOG.warn { "Unsupported manifest.json version: ${manifest.version}" }
                 }
-                val description = loadDescription(manifest)
-                val patches = extractPatches(manifest, description)
+                val patch = extractSinglePatch(manifest)
                 val summary = extractSummary(manifest)
                 val summaryMarkdownFile = getSummaryFile(manifest)
                 val metrics = loadMetrics(manifest)
-                return CodeModernizerArtifact(zipPath, manifest, patches, description, summary, summaryMarkdownFile, metrics)
+                return CodeModernizerArtifact(zipPath, manifest, patch, summary, summaryMarkdownFile, metrics)
             }
             throw RuntimeException("Could not find artifact")
         }
@@ -119,28 +117,8 @@ open class CodeModernizerArtifact(
             }
         }
 
-        private fun extractPatches(manifest: CodeModernizerManifest, description: List<PatchInfo>?): List<VirtualFile> {
-            if (description == null) {
-                return extractSinglePatch(manifest)
-            }
-            val fileSystem = LocalFileSystem.getInstance()
-            val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot)
-            if (!patchesDir.isDirectory()) {
-                error("Expected root for patches was not a directory.")
-            }
-            return description.map { patchInfo ->
-                val patchFile = patchesDir.resolve(patchInfo.filename)
-                if (patchFile.toFile().exists()) {
-                    fileSystem.refreshAndFindFileByNioFile(patchFile)
-                        ?: error("Could not find patch: ${patchInfo.filename}")
-                } else {
-                    error("Patch file not found: ${patchInfo.filename}")
-                }
-            }
-        }
-
         @OptIn(ExperimentalPathApi::class)
-        private fun extractSinglePatch(manifest: CodeModernizerManifest): List<VirtualFile> {
+        private fun extractSinglePatch(manifest: CodeModernizerManifest): VirtualFile {
             val fileSystem = LocalFileSystem.getInstance()
             val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot)
             if (!patchesDir.isDirectory()) {
@@ -148,24 +126,7 @@ open class CodeModernizerArtifact(
             }
             return patchesDir.walk()
                 .map { fileSystem.refreshAndFindFileByNioFile(it) ?: throw RuntimeException("Could not find diff.patch") }
-                .toList()
-        }
-
-        private fun loadDescription(manifest: CodeModernizerManifest): List<PatchInfo>? {
-            val patchesDir = tempDir.toPath().resolve(manifest.patchesRoot).toFile()
-            if (!patchesDir.isDirectory) {
-                throw RuntimeException("Expected root for patches was not a directory.")
-            }
-
-            val descriptionFile = patchesDir.listFiles()
-                ?.firstOrNull { it.name.endsWith(".json") }
-
-            if (descriptionFile == null) {
-                // No JSON description file found, return null
-                return null
-            }
-            val descriptionContent: DescriptionContent = MAPPER.readValue<DescriptionContent>(descriptionFile)
-            return descriptionContent.content
+                .toList().first()
         }
     }
 }
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt
index 1b8bcbbd1d3..be4bc0303ac 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerManifest.kt
@@ -7,9 +7,3 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class CodeModernizerManifest(val version: Float, val patchesRoot: String, val artifactsRoot: String, val summaryRoot: String, val metricsRoot: String)
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-data class PatchInfo(val name: String, val filename: String, val isSuccessful: Boolean)
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-data class DescriptionContent(val content: List<PatchInfo>)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json
deleted file mode 100644
index 5420780a66d..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/diffPatchOutput.json
+++ /dev/null
@@ -1 +0,0 @@
-{"content":[{"filename":"min_jdk_upgrade.patch","isSuccessful":false,"name":"Prepare minimal upgrade to Java 17"},{"filename":"popular_enterprise_application_framework.patch","isSuccessful":false,"name":"Popular Enterprise Specifications and Application Frameworks upgrade"},{"filename":"testing_tool.patch","isSuccessful":false,"name":"Testing Tools and Frameworks upgrade"},{"filename":"update_deprecated_api.patch","isSuccessful":false,"name":"Upgrade Deprecated API"}]}
\ No newline at end of file
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip
deleted file mode 100644
index 61d3e4bb60f..00000000000
Binary files a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/multiple-diff.zip and /dev/null differ
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch
deleted file mode 100644
index 3290286ea4e..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/popular_enterprise_application_framework.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java b/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java
-index 50b2c90..8e9b1f8 100644
---- a/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java
-+++ b/src/test/java/org/springframework/web/filter/Sha512ShallowEtagHeaderFilter.java
-@@ -5,9 +5,9 @@ import com.google.common.hash.Hashing;
- 
- public class Sha512ShallowEtagHeaderFilter extends ShallowEtagHeaderFilter {
- 
--	@Override
- 	protected String generateETagHeaderValue(byte[] bytes) {
- 		final HashCode hash = Hashing.sha512().hashBytes(bytes);
- 		return "\"" + hash + "\"";
- 	}
- }
-+            
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch
deleted file mode 100644
index 4dd31fefc73..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/testing_tool.patch
+++ /dev/null
@@ -1,838 +0,0 @@
-diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
-index f95f1ee..20c678d 100644
---- a/.mvn/wrapper/maven-wrapper.properties
-+++ b/.mvn/wrapper/maven-wrapper.properties
-@@ -16,4 +16,5 @@
- # under the License.
- wrapperVersion=3.3.2
- distributionType=only-script
--distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
-+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-+distributionSha256Sum=7822eb593d29558d8edf87845a2c47e36e2a89d17a84cd2390824633214ed423
-diff --git a/mvnw b/mvnw
-old mode 100644
-new mode 100755
-index 19529dd..5e9618c
---- a/mvnw
-+++ b/mvnw
-@@ -21,239 +21,312 @@
- # ----------------------------------------------------------------------------
- # Apache Maven Wrapper startup batch script, version 3.3.2
- #
-+# Required ENV vars:
-+# ------------------
-+#   JAVA_HOME - location of a JDK home dir
-+#
- # Optional ENV vars
- # -----------------
--#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
--#   MVNW_REPOURL - repo url base for downloading maven distribution
--#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
--#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
-+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-+#     e.g. to debug Maven itself, use
-+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
- # ----------------------------------------------------------------------------
- 
--set -euf
--[ "${MVNW_VERBOSE-}" != debug ] || set -x
-+if [ -z "$MAVEN_SKIP_RC" ]; then
-+
-+  if [ -f /usr/local/etc/mavenrc ]; then
-+    . /usr/local/etc/mavenrc
-+  fi
-+
-+  if [ -f /etc/mavenrc ]; then
-+    . /etc/mavenrc
-+  fi
- 
--# OS specific support.
--native_path() { printf %s\\n "$1"; }
-+  if [ -f "$HOME/.mavenrc" ]; then
-+    . "$HOME/.mavenrc"
-+  fi
-+
-+fi
-+
-+# OS specific support.  $var _must_ be set to either true or false.
-+cygwin=false
-+darwin=false
-+mingw=false
- case "$(uname)" in
--CYGWIN* | MINGW*)
--  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
--  native_path() { cygpath --path --windows "$1"; }
-+CYGWIN*) cygwin=true ;;
-+MINGW*) mingw=true ;;
-+Darwin*)
-+  darwin=true
-+  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-+  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-+  if [ -z "$JAVA_HOME" ]; then
-+    if [ -x "/usr/libexec/java_home" ]; then
-+      JAVA_HOME="$(/usr/libexec/java_home)"
-+      export JAVA_HOME
-+    else
-+      JAVA_HOME="/Library/Java/Home"
-+      export JAVA_HOME
-+    fi
-+  fi
-   ;;
- esac
- 
--# set JAVACMD and JAVACCMD
--set_java_home() {
--  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
--  if [ -n "${JAVA_HOME-}" ]; then
-+if [ -z "$JAVA_HOME" ]; then
-+  if [ -r /etc/gentoo-release ]; then
-+    JAVA_HOME=$(java-config --jre-home)
-+  fi
-+fi
-+
-+# For Cygwin, ensure paths are in UNIX format before anything is touched
-+if $cygwin; then
-+  [ -n "$JAVA_HOME" ] \
-+    && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
-+  [ -n "$CLASSPATH" ] \
-+    && CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-+fi
-+
-+# For Mingw, ensure paths are in UNIX format before anything is touched
-+if $mingw; then
-+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
-+    && JAVA_HOME="$(
-+      cd "$JAVA_HOME" || (
-+        echo "cannot cd into $JAVA_HOME." >&2
-+        exit 1
-+      )
-+      pwd
-+    )"
-+fi
-+
-+if [ -z "$JAVA_HOME" ]; then
-+  javaExecutable="$(which javac)"
-+  if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then
-+    # readlink(1) is not available as standard on Solaris 10.
-+    readLink=$(which readlink)
-+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
-+      if $darwin; then
-+        javaHome="$(dirname "$javaExecutable")"
-+        javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
-+      else
-+        javaExecutable="$(readlink -f "$javaExecutable")"
-+      fi
-+      javaHome="$(dirname "$javaExecutable")"
-+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
-+      JAVA_HOME="$javaHome"
-+      export JAVA_HOME
-+    fi
-+  fi
-+fi
-+
-+if [ -z "$JAVACMD" ]; then
-+  if [ -n "$JAVA_HOME" ]; then
-     if [ -x "$JAVA_HOME/jre/sh/java" ]; then
-       # IBM's JDK on AIX uses strange locations for the executables
-       JAVACMD="$JAVA_HOME/jre/sh/java"
--      JAVACCMD="$JAVA_HOME/jre/sh/javac"
-     else
-       JAVACMD="$JAVA_HOME/bin/java"
--      JAVACCMD="$JAVA_HOME/bin/javac"
--
--      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
--        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
--        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
--        return 1
--      fi
-     fi
-   else
-     JAVACMD="$(
--      'set' +e
--      'unset' -f command 2>/dev/null
--      'command' -v java
--    )" || :
--    JAVACCMD="$(
--      'set' +e
--      'unset' -f command 2>/dev/null
--      'command' -v javac
--    )" || :
--
--    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
--      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
--      return 1
--    fi
-+      \unset -f command 2>/dev/null
-+      \command -v java
-+    )"
-   fi
--}
--
--# hash string like Java String::hashCode
--hash_string() {
--  str="${1:-}" h=0
--  while [ -n "$str" ]; do
--    char="${str%"${str#?}"}"
--    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
--    str="${str#?}"
--  done
--  printf %x\\n $h
--}
--
--verbose() { :; }
--[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
-+fi
- 
--die() {
--  printf %s\\n "$1" >&2
-+if [ ! -x "$JAVACMD" ]; then
-+  echo "Error: JAVA_HOME is not defined correctly." >&2
-+  echo "  We cannot execute $JAVACMD" >&2
-   exit 1
--}
-+fi
- 
--trim() {
--  # MWRAPPER-139:
--  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
--  #   Needed for removing poorly interpreted newline sequences when running in more
--  #   exotic environments such as mingw bash on Windows.
--  printf "%s" "${1}" | tr -d '[:space:]'
--}
-+if [ -z "$JAVA_HOME" ]; then
-+  echo "Warning: JAVA_HOME environment variable is not set." >&2
-+fi
- 
--# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
--while IFS="=" read -r key value; do
--  case "${key-}" in
--  distributionUrl) distributionUrl=$(trim "${value-}") ;;
--  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
--  esac
--done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
--[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
-+# traverses directory structure from process work directory to filesystem root
-+# first directory with .mvn subdirectory is considered project base directory
-+find_maven_basedir() {
-+  if [ -z "$1" ]; then
-+    echo "Path not specified to find_maven_basedir" >&2
-+    return 1
-+  fi
- 
--case "${distributionUrl##*/}" in
--maven-mvnd-*bin.*)
--  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
--  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
--  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
--  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
--  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
--  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
--  *)
--    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
--    distributionPlatform=linux-amd64
--    ;;
--  esac
--  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
--  ;;
--maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
--*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
--esac
-+  basedir="$1"
-+  wdir="$1"
-+  while [ "$wdir" != '/' ]; do
-+    if [ -d "$wdir"/.mvn ]; then
-+      basedir=$wdir
-+      break
-+    fi
-+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-+    if [ -d "${wdir}" ]; then
-+      wdir=$(
-+        cd "$wdir/.." || exit 1
-+        pwd
-+      )
-+    fi
-+    # end of workaround
-+  done
-+  printf '%s' "$(
-+    cd "$basedir" || exit 1
-+    pwd
-+  )"
-+}
- 
--# apply MVNW_REPOURL and calculate MAVEN_HOME
--# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
--[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
--distributionUrlName="${distributionUrl##*/}"
--distributionUrlNameMain="${distributionUrlName%.*}"
--distributionUrlNameMain="${distributionUrlNameMain%-bin}"
--MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
--MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
-+# concatenates all lines of a file
-+concat_lines() {
-+  if [ -f "$1" ]; then
-+    # Remove \r in case we run on Windows within Git Bash
-+    # and check out the repository with auto CRLF management
-+    # enabled. Otherwise, we may read lines that are delimited with
-+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
-+    # splitting rules.
-+    tr -s '\r\n' ' ' <"$1"
-+  fi
-+}
- 
--exec_maven() {
--  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
--  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
-+log() {
-+  if [ "$MVNW_VERBOSE" = true ]; then
-+    printf '%s\n' "$1"
-+  fi
- }
- 
--if [ -d "$MAVEN_HOME" ]; then
--  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
--  exec_maven "$@"
-+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-+if [ -z "$BASE_DIR" ]; then
-+  exit 1
- fi
- 
--case "${distributionUrl-}" in
--*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
--*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
--esac
-+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-+export MAVEN_PROJECTBASEDIR
-+log "$MAVEN_PROJECTBASEDIR"
- 
--# prepare tmp dir
--if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
--  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
--  trap clean HUP INT TERM EXIT
-+##########################################################################################
-+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-+# This allows using the maven wrapper in projects that prohibit checking in binary data.
-+##########################################################################################
-+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-+if [ -r "$wrapperJarPath" ]; then
-+  log "Found $wrapperJarPath"
- else
--  die "cannot create temp dir"
--fi
--
--mkdir -p -- "${MAVEN_HOME%/*}"
-+  log "Couldn't find $wrapperJarPath, downloading it ..."
- 
--# Download and Install Apache Maven
--verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
--verbose "Downloading from: $distributionUrl"
--verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
--
--# select .zip or .tar.gz
--if ! command -v unzip >/dev/null; then
--  distributionUrl="${distributionUrl%.zip}.tar.gz"
--  distributionUrlName="${distributionUrl##*/}"
--fi
--
--# verbose opt
--__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
--[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-+  if [ -n "$MVNW_REPOURL" ]; then
-+    wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
-+  else
-+    wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
-+  fi
-+  while IFS="=" read -r key value; do
-+    # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
-+    safeValue=$(echo "$value" | tr -d '\r')
-+    case "$key" in wrapperUrl)
-+      wrapperUrl="$safeValue"
-+      break
-+      ;;
-+    esac
-+  done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-+  log "Downloading from: $wrapperUrl"
- 
--# normalize http auth
--case "${MVNW_PASSWORD:+has-password}" in
--'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
--has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
--esac
-+  if $cygwin; then
-+    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-+  fi
- 
--if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
--  verbose "Found wget ... using wget"
--  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
--elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
--  verbose "Found curl ... using curl"
--  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
--elif set_java_home; then
--  verbose "Falling back to use Java to download"
--  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
--  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
--  cat >"$javaSource" <<-END
--	public class Downloader extends java.net.Authenticator
--	{
--	  protected java.net.PasswordAuthentication getPasswordAuthentication()
--	  {
--	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
--	  }
--	  public static void main( String[] args ) throws Exception
--	  {
--	    setDefault( new Downloader() );
--	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
--	  }
--	}
--	END
--  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
--  verbose " - Compiling Downloader.java ..."
--  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
--  verbose " - Running Downloader.java ..."
--  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
-+  if command -v wget >/dev/null; then
-+    log "Found wget ... using wget"
-+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
-+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-+      wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-+    else
-+      wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-+    fi
-+  elif command -v curl >/dev/null; then
-+    log "Found curl ... using curl"
-+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
-+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-+      curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-+    else
-+      curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-+    fi
-+  else
-+    log "Falling back to using Java to download"
-+    javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-+    javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
-+    # For Cygwin, switch paths to Windows format before running javac
-+    if $cygwin; then
-+      javaSource=$(cygpath --path --windows "$javaSource")
-+      javaClass=$(cygpath --path --windows "$javaClass")
-+    fi
-+    if [ -e "$javaSource" ]; then
-+      if [ ! -e "$javaClass" ]; then
-+        log " - Compiling MavenWrapperDownloader.java ..."
-+        ("$JAVA_HOME/bin/javac" "$javaSource")
-+      fi
-+      if [ -e "$javaClass" ]; then
-+        log " - Running MavenWrapperDownloader.java ..."
-+        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
-+      fi
-+    fi
-+  fi
- fi
-+##########################################################################################
-+# End of extension
-+##########################################################################################
- 
--# If specified, validate the SHA-256 sum of the Maven distribution zip file
--if [ -n "${distributionSha256Sum-}" ]; then
--  distributionSha256Result=false
--  if [ "$MVN_CMD" = mvnd.sh ]; then
--    echo "Checksum validation is not supported for maven-mvnd." >&2
--    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
--    exit 1
--  elif command -v sha256sum >/dev/null; then
--    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
--      distributionSha256Result=true
-+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-+wrapperSha256Sum=""
-+while IFS="=" read -r key value; do
-+  case "$key" in wrapperSha256Sum)
-+    wrapperSha256Sum=$value
-+    break
-+    ;;
-+  esac
-+done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-+if [ -n "$wrapperSha256Sum" ]; then
-+  wrapperSha256Result=false
-+  if command -v sha256sum >/dev/null; then
-+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c >/dev/null 2>&1; then
-+      wrapperSha256Result=true
-     fi
-   elif command -v shasum >/dev/null; then
--    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
--      distributionSha256Result=true
-+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then
-+      wrapperSha256Result=true
-     fi
-   else
-     echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
--    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
-+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2
-     exit 1
-   fi
--  if [ $distributionSha256Result = false ]; then
--    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
--    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
-+  if [ $wrapperSha256Result = false ]; then
-+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
-+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
-+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
-     exit 1
-   fi
- fi
- 
--# unzip and move
--if command -v unzip >/dev/null; then
--  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
--else
--  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
-+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-+
-+# For Cygwin, switch paths to Windows format before running java
-+if $cygwin; then
-+  [ -n "$JAVA_HOME" ] \
-+    && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-+  [ -n "$CLASSPATH" ] \
-+    && CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-+  [ -n "$MAVEN_PROJECTBASEDIR" ] \
-+    && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
- fi
--printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
--mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
- 
--clean || :
--exec_maven "$@"
-+# Provide a "standardized" way to retrieve the CLI args that will
-+# work with both Windows and non-Windows executions.
-+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
-+export MAVEN_CMD_LINE_ARGS
-+
-+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-+
-+# shellcheck disable=SC2086 # safe args
-+exec "$JAVACMD" \
-+  $MAVEN_OPTS \
-+  $MAVEN_DEBUG_OPTS \
-+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
-diff --git a/mvnw.cmd b/mvnw.cmd
-old mode 100644
-new mode 100755
-index b150b91..1204076
---- a/mvnw.cmd
-+++ b/mvnw.cmd
-@@ -1,4 +1,3 @@
--<# : batch portion
- @REM ----------------------------------------------------------------------------
- @REM Licensed to the Apache Software Foundation (ASF) under one
- @REM or more contributor license agreements.  See the NOTICE file
-@@ -21,129 +20,187 @@
- @REM ----------------------------------------------------------------------------
- @REM Apache Maven Wrapper startup batch script, version 3.3.2
- @REM
-+@REM Required ENV vars:
-+@REM JAVA_HOME - location of a JDK home dir
-+@REM
- @REM Optional ENV vars
--@REM   MVNW_REPOURL - repo url base for downloading maven distribution
--@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
--@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
-+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-+@REM     e.g. to debug Maven itself, use
-+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
- @REM ----------------------------------------------------------------------------
- 
--@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
--@SET __MVNW_CMD__=
--@SET __MVNW_ERROR__=
--@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
--@SET PSModulePath=
--@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
--  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
-+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-+@echo off
-+@REM set title of command window
-+title %0
-+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-+
-+@REM set %HOME% to equivalent of $HOME
-+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-+
-+@REM Execute a user defined script before this one
-+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-+:skipRcPre
-+
-+@setlocal
-+
-+set ERROR_CODE=0
-+
-+@REM To isolate internal variables from possible post scripts, we use another setlocal
-+@setlocal
-+
-+@REM ==== START VALIDATION ====
-+if not "%JAVA_HOME%" == "" goto OkJHome
-+
-+echo. >&2
-+echo Error: JAVA_HOME not found in your environment. >&2
-+echo Please set the JAVA_HOME variable in your environment to match the >&2
-+echo location of your Java installation. >&2
-+echo. >&2
-+goto error
-+
-+:OkJHome
-+if exist "%JAVA_HOME%\bin\java.exe" goto init
-+
-+echo. >&2
-+echo Error: JAVA_HOME is set to an invalid directory. >&2
-+echo JAVA_HOME = "%JAVA_HOME%" >&2
-+echo Please set the JAVA_HOME variable in your environment to match the >&2
-+echo location of your Java installation. >&2
-+echo. >&2
-+goto error
-+
-+@REM ==== END VALIDATION ====
-+
-+:init
-+
-+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-+@REM Fallback to current working directory if not found.
-+
-+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-+
-+set EXEC_DIR=%CD%
-+set WDIR=%EXEC_DIR%
-+:findBaseDir
-+IF EXIST "%WDIR%"\.mvn goto baseDirFound
-+cd ..
-+IF "%WDIR%"=="%CD%" goto baseDirNotFound
-+set WDIR=%CD%
-+goto findBaseDir
-+
-+:baseDirFound
-+set MAVEN_PROJECTBASEDIR=%WDIR%
-+cd "%EXEC_DIR%"
-+goto endDetectBaseDir
-+
-+:baseDirNotFound
-+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-+cd "%EXEC_DIR%"
-+
-+:endDetectBaseDir
-+
-+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-+
-+@setlocal EnableExtensions EnableDelayedExpansion
-+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-+
-+:endReadAdditionalConfig
-+
-+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-+
-+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
-+
-+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-+)
-+
-+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-+if exist %WRAPPER_JAR% (
-+    if "%MVNW_VERBOSE%" == "true" (
-+        echo Found %WRAPPER_JAR%
-+    )
-+) else (
-+    if not "%MVNW_REPOURL%" == "" (
-+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar"
-+    )
-+    if "%MVNW_VERBOSE%" == "true" (
-+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-+        echo Downloading from: %WRAPPER_URL%
-+    )
-+
-+    powershell -Command "&{"^
-+		"$webclient = new-object System.Net.WebClient;"^
-+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-+		"}"^
-+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-+		"}"
-+    if "%MVNW_VERBOSE%" == "true" (
-+        echo Finished downloading %WRAPPER_JAR%
-+    )
-+)
-+@REM End of extension
-+
-+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-+SET WRAPPER_SHA_256_SUM=""
-+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
- )
--@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
--@SET __MVNW_PSMODULEP_SAVE=
--@SET __MVNW_ARG0_NAME__=
--@SET MVNW_USERNAME=
--@SET MVNW_PASSWORD=
--@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
--@echo Cannot start maven from wrapper >&2 && exit /b 1
--@GOTO :EOF
--: end batch / begin powershell #>
--
--$ErrorActionPreference = "Stop"
--if ($env:MVNW_VERBOSE -eq "true") {
--  $VerbosePreference = "Continue"
--}
--
--# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
--$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
--if (!$distributionUrl) {
--  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
--}
--
--switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
--  "maven-mvnd-*" {
--    $USE_MVND = $true
--    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
--    $MVN_CMD = "mvnd.cmd"
--    break
--  }
--  default {
--    $USE_MVND = $false
--    $MVN_CMD = $script -replace '^mvnw','mvn'
--    break
--  }
--}
--
--# apply MVNW_REPOURL and calculate MAVEN_HOME
--# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
--if ($env:MVNW_REPOURL) {
--  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
--  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
--}
--$distributionUrlName = $distributionUrl -replace '^.*/',''
--$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
--$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
--if ($env:MAVEN_USER_HOME) {
--  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
--}
--$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
--$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
--
--if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
--  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
--  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
--  exit $?
--}
--
--if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
--  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
--}
--
--# prepare tmp dir
--$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
--$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
--$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
--trap {
--  if ($TMP_DOWNLOAD_DIR.Exists) {
--    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
--    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
--  }
--}
--
--New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
--
--# Download and Install Apache Maven
--Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
--Write-Verbose "Downloading from: $distributionUrl"
--Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
--
--$webclient = New-Object System.Net.WebClient
--if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
--  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
--}
--[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
--$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
--
--# If specified, validate the SHA-256 sum of the Maven distribution zip file
--$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
--if ($distributionSha256Sum) {
--  if ($USE_MVND) {
--    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
--  }
--  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
--  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
--    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
--  }
--}
--
--# unzip and move
--Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
--Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
--try {
--  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
--} catch {
--  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
--    Write-Error "fail to move MAVEN_HOME"
--  }
--} finally {
--  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
--  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
--}
--
--Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
-+IF NOT %WRAPPER_SHA_256_SUM%=="" (
-+    powershell -Command "&{"^
-+       "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^
-+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
-+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
-+       "  Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
-+       "  Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
-+       "  Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
-+       "  exit 1;"^
-+       "}"^
-+       "}"
-+    if ERRORLEVEL 1 goto error
-+)
-+
-+@REM Provide a "standardized" way to retrieve the CLI args that will
-+@REM work with both Windows and non-Windows executions.
-+set MAVEN_CMD_LINE_ARGS=%*
-+
-+%MAVEN_JAVA_EXE% ^
-+  %JVM_CONFIG_MAVEN_PROPS% ^
-+  %MAVEN_OPTS% ^
-+  %MAVEN_DEBUG_OPTS% ^
-+  -classpath %WRAPPER_JAR% ^
-+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-+if ERRORLEVEL 1 goto error
-+goto end
-+
-+:error
-+set ERROR_CODE=1
-+
-+:end
-+@endlocal & set ERROR_CODE=%ERROR_CODE%
-+
-+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-+@REM check for post script, once with legacy .bat ending and once with .cmd ending
-+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-+:skipRcPost
-+
-+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-+if "%MAVEN_BATCH_PAUSE%"=="on" pause
-+
-+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-+
-+cmd /C exit /B %ERROR_CODE%
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch b/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch
deleted file mode 100644
index 42ea73fdc7f..00000000000
--- a/plugins/amazonq/codetransform/jetbrains-community/tst-resources/codemodernizer/update_deprecated_api.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index ff20499..7f6c83b 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -8,6 +8,9 @@
-         <java.version>17</java.version>
-         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-         <spring.version>4.1.1.RELEASE</spring.version>
-+        <maven.compiler.source>17</maven.compiler.source>
-+        <maven.compiler.target>17</maven.compiler.target>
-+        <maven.compiler.release>17</maven.compiler.release>
-     </properties>
-     <parent>
-         <groupId>org.springframework.boot</groupId>
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatTest.kt
index e9d53b59387..975f191f4df 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatTest.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatTest.kt
@@ -27,23 +27,23 @@ class CodeTransformChatTest {
     }
 
     @Test
-    fun `test that transform result chat item includes view summary button and view diff button with correct label when job fully succeeded with 5 patch files`() {
+    fun `test that transform result chat item includes view summary button and view diff button with correct label when job fully succeeded`() {
         val result = CodeModernizerJobCompletedResult.JobCompletedSuccessfully(JobId("dummy-job-id-123"))
-        val chatItem = buildTransformResultChatContent(result, 5)
-        assertThat(chatItem.message).isEqualTo(message("codemodernizer.chat.message.result.success.multiple_diffs"))
+        val chatItem = buildTransformResultChatContent(result)
+        assertThat(chatItem.message).isEqualTo(message("codemodernizer.chat.message.result.success"))
         assertThat(chatItem.buttons)
             .hasSize(2)
             .satisfiesKt { buttons ->
                 assertThat(buttons[0].id).isEqualTo(CodeTransformButtonId.ViewDiff.id)
-                assertThat(buttons[0].text).isEqualTo("View diff 1/5")
+                assertThat(buttons[0].text).isEqualTo("View diff")
                 assertThat(buttons[1].id).isEqualTo(CodeTransformButtonId.ViewSummary.id)
             }
     }
 
     @Test
-    fun `test that transform result chat item includes view summary button and view diff button with correct label when job partially succeeded with 1 patch file`() {
+    fun `test that transform result chat item includes view summary button and view diff button with correct label when job partially succeeded`() {
         val result = CodeModernizerJobCompletedResult.JobPartiallySucceeded(JobId("dummy-job-id-123"))
-        val chatItem = buildTransformResultChatContent(result, 1)
+        val chatItem = buildTransformResultChatContent(result)
         assertThat(chatItem.message).isEqualTo(message("codemodernizer.chat.message.result.partially_success"))
 
         assertThat(chatItem.buttons)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt
index 72fef62a11e..f4ac5c09799 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt
@@ -146,7 +146,7 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
             root.children[0],
             JavaSdkVersion.JDK_1_8,
             JavaSdkVersion.JDK_11,
-            listOf(EXPLAINABILITY_V1, SELECTIVE_TRANSFORMATION_V1),
+            listOf(EXPLAINABILITY_V1),
             MAVEN_BUILD_SKIP_UNIT_TESTS
         )
         val mockFile = mock(File::class.java)
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt
index c5927c6d733..a6f2af3b7c0 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTest.kt
@@ -142,13 +142,11 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {
         doAnswer {
             mockDialog.showAndGet()
             mockDialog
-        }.whenever(handler).displayDiffUsingPatch(any(), any(), any(), any())
+        }.whenever(handler).displayDiffUsingPatch(any(), any())
         handler.displayDiff(jobId)
         verify(handler, never()).notifyUnableToApplyPatch(any())
         verify(handler, times(1)).displayDiffUsingPatch(
-            testCodeModernizerArtifact.patches[0],
-            testCodeModernizerArtifact.patches.size,
-            testCodeModernizerArtifact.description?.get(0),
+            testCodeModernizerArtifact.patch,
             jobId,
         )
     }
@@ -205,14 +203,6 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {
         assertEquals(validMetrics.linesOfCodeChanged, artifact.metrics?.linesOfCodeChanged)
     }
 
-    @Test
-    fun `CodeModernizerArtifact can process a valid zip file with multiple diffs`() {
-        val artifact = CodeModernizerArtifact.create(multipleDiffZipPath.toAbsolutePath().toString())
-        assertEquals(4, artifact.patches.size)
-        assertEquals(validManifest, artifact.manifest)
-        assertEquals(validMetricsMultipleDiffs.linesOfCodeChanged, artifact.metrics?.linesOfCodeChanged)
-    }
-
     @Test
     fun `can unzip a file`() {
         val tempDir = createTempDirectory()
@@ -222,15 +212,6 @@ class CodeWhispererCodeModernizerTest : CodeWhispererCodeModernizerTestBase() {
         assert(tempDir.resolve(validZipPatchFilePath).exists())
     }
 
-    @Test
-    fun `can unzip a file with multiple diffs`() {
-        val tempDir = createTempDirectory()
-        val result = unzipFile(multipleDiffZipPath, tempDir)
-        assert(result)
-        assert(tempDir.resolve(validZipManifestPath).exists())
-        assert(tempDir.resolve(validZipPatchFilePath).exists())
-    }
-
     @Test
     fun `can unzip only sources folder`() {
         val tempDir = createTempDirectory("test_zip")
diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt
index 9c20dfa9b5d..e640eebbdd2 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerTestBase.kt
@@ -51,13 +51,11 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenAu
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact
-import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerArtifact.Companion.MAPPER
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerManifest
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerMetrics
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformFailureBuildLog
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
-import software.aws.toolkits.jetbrains.services.codemodernizer.model.DescriptionContent
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
@@ -92,24 +90,12 @@ open class CodeWhispererCodeModernizerTestBase(
     internal lateinit var testSessionStateSpy: CodeModernizerSessionState
     internal val minJDKUpgradePatchResource = "min_jdk_upgrade.patch".toResourceFile()
     internal val minJDKUpgradePatchResourceFile = LightVirtualFile("min_jdk_upgrade.patch", minJDKUpgradePatchResource.readText())
-    internal val enterpriseApplicationUpgradePatchResource = "popular_enterprise_application_framework.patch".toResourceFile()
-    internal val enterpriseApplicationUpgradePatchResourceFile = LightVirtualFile(
-        "popular_enterprise_application_framework.patch",
-        enterpriseApplicationUpgradePatchResource.readText()
-    )
-    internal val testingToolPatchResource = "testing_tool.patch".toResourceFile()
-    internal val testingToolPatchResourceFile = LightVirtualFile("testing_tool.patch", testingToolPatchResource.readText())
-    internal val deprecatedAPIPatchResource = "update_deprecated_api.patch".toResourceFile()
-    internal val deprecatedAPIPatchResourceFile = LightVirtualFile("update_deprecated_api.patch", deprecatedAPIPatchResource.readText())
-    internal val diffJsonResource = "diffPatchOutput.json".toResourceFile()
-    internal val exampleDescriptionContent: DescriptionContent = MAPPER.readValue(diffJsonResource, DescriptionContent::class.java)
     internal val emptyPomFile = LightVirtualFile("pom.xml", "")
     internal val emptyPomFileSpy = spy(emptyPomFile)
     internal val jobId = JobId("Test job id")
     internal lateinit var testCodeModernizerArtifact: CodeModernizerArtifact
     internal lateinit var testTransformFailureBuildLog: CodeTransformFailureBuildLog
     internal val exampleZipPath = "simple.zip".toResourceFile().toPath()
-    internal val multipleDiffZipPath = "multiple-diff.zip".toResourceFile().toPath()
     internal val expectedFilePath = "expectedFile".toResourceFile().toPath()
     internal val overwrittenFilePath = "overwrittenFile".toResourceFile().toPath()
     internal val testRequestId = "test_aws_request_id"
@@ -307,7 +293,7 @@ open class CodeWhispererCodeModernizerTestBase(
                 virtualFileMock,
                 JavaSdkVersion.JDK_1_8,
                 JavaSdkVersion.JDK_11,
-                listOf("EXPLAINABILITY_V1", "SELECTIVE_TRANSFORMATION_V1"),
+                listOf("EXPLAINABILITY_V1"),
                 "test"
             )
         )
@@ -319,13 +305,7 @@ open class CodeWhispererCodeModernizerTestBase(
                 CodeModernizerArtifact(
                     exampleZipPath.toAbsolutePath().toString(),
                     validManifest,
-                    listOf(
-                        minJDKUpgradePatchResourceFile,
-                        enterpriseApplicationUpgradePatchResourceFile,
-                        testingToolPatchResourceFile,
-                        deprecatedAPIPatchResourceFile
-                    ),
-                    exampleDescriptionContent.content,
+                    minJDKUpgradePatchResourceFile,
                     validTransformationSummary,
                     summaryFileMock,
                     validMetrics
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts
index 08d1335a03f..8494d37d104 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTransformChatConnector.ts
@@ -291,13 +291,6 @@ export class CodeTransformChatConnector {
                 tabType: 'codetransform',
                 skipTestsSelection: action.formItemValues?.skipTestsSelection
             })
-        }  else if (action.id === FormButtonIds.CodeTransformInputOneOrMultipleDiffs) {
-            this.sendMessageToExtension({
-                command: 'codetransform-confirm-one-or-multiple-diffs',
-                tabID,
-                tabType: 'codetransform',
-                oneOrMultipleDiffsSelection: action.formItemValues?.oneOrMultipleDiffsSelection
-            })
         } else if (action.id === FormButtonIds.CodeTransformInputCustomDependencyVersions) {
             this.sendMessageToExtension({
                 command: 'codetransform-input-confirm-custom-dependency-versions',
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
index 01486f01f2a..8cf9e1c8363 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/commands.ts
@@ -38,7 +38,6 @@ type MessageCommand =
     | 'codetransform-stop'
     | 'codetransform-continue'
     | 'codetransform-confirm-skip-tests'
-    | 'codetransform-confirm-one-or-multiple-diffs'
     | 'codetransform-input-confirm-custom-dependency-versions'
     | 'codetransform-new'
     | 'codetransform-open-transform-hub'
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
index 22b913acf96..3991f14c5dd 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
@@ -10,7 +10,6 @@ export const enum FormButtonIds {
   CodeTransformInputCancel = 'codetransform-input-cancel',
   CodeTransformInputContinue = 'codetransform-input-continue',
   CodeTransformInputSkipTests = 'codetransform-input-confirm-skip-tests',
-  CodeTransformInputOneOrMultipleDiffs = 'codetransform-input-confirm-one-or-multiple-diffs',
   CodeTransformInputCustomDependencyVersions = 'codetransform-input-confirm-custom-dependency-versions',
   OpenMvnBuild = 'open_mvn_build',
   StopTransform = 'stop_transform',
@@ -49,7 +48,6 @@ export const isFormButtonCodeTransform = (id: string): boolean => {
     id === FormButtonIds.CodeTransformInputSQLModuleSchema ||
     id === FormButtonIds.CodeTransformInputSkipTests ||
     id === FormButtonIds.CodeTransformInputContinue ||
-    id === FormButtonIds.CodeTransformInputOneOrMultipleDiffs ||
     id === FormButtonIds.CodeTransformInputCustomDependencyVersions ||
     id === FormButtonIds.CodeTransformViewDiff ||
     id === FormButtonIds.CodeTransformViewSummary ||
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
index 3720c69650e..0aaf82bbd84 100644
--- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
+++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -672,18 +672,12 @@ codemodernizer.chat.message.hil.user_rejected=I'll continue upgrading your modul
 codemodernizer.chat.message.local_build_begin=I'm building your module. This can take up to 10 minutes, depending on the size of your module.
 codemodernizer.chat.message.local_build_failed=Sorry, I couldn't run the Maven clean install command to build your module.
 codemodernizer.chat.message.local_build_success=I was able to build your module and will start uploading your code.
-codemodernizer.chat.message.one_or_multiple_diffs=If you would like to update and test your code with fewer changes at a time, I can divide the transformation results into separate diff patches. If applicable to your application, I can split up the diffs up into the following groups of upgrades. Here are the upgrades included in each diff:\n\n\ - Minimal Compatible Library Upgrade to Java {0}: Dependencies to the minimum compatible versions in Java {0}, including Springboot, JUnit, and PowerMockito.\n\n\ - Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.\n\n\ - HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.\n\n\ - Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper.\n\n\ - Miscellaneous Processing Documentation: Diverse set spanning ORMs, XML processing, and API documentation like Swagger to SpringDoc/OpenAPI.\n\n\ - Deprecated API replacement, dependency upgrades, and formatting: Replaces deprecated APIs, makes additional dependency version upgrades, and formats code changes.
-codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs=Multiple diffs
-codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff=One diff
-codemodernizer.chat.message.one_or_multiple_diffs_form.response=Okay, I will create {0} with my proposed changes.
 codemodernizer.chat.message.result.fail=Sorry, I ran into an issue during the transformation. Please try again.
 codemodernizer.chat.message.result.fail_initial_build=I am having trouble building your project in the secure build environment and couldn't complete the transformation.
 codemodernizer.chat.message.result.fail_initial_build_no_build_log=I am having trouble building your project in the secure build environment: {0}.
 codemodernizer.chat.message.result.fail_with_known_reason=Sorry, I couldn''t complete the transformation. {0}
 codemodernizer.chat.message.result.partially_success=I transformed part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.
-codemodernizer.chat.message.result.partially_success.multiple_diffs=I transformed part of your code. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.
 codemodernizer.chat.message.result.success=I successfully completed your transformation. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the changes I'm proposing.
-codemodernizer.chat.message.result.success.multiple_diffs=I successfully completed your transformation. You will be able to accept changes from one diff at a time. If you reject changes in one diff, you will not be able to view or accept changes in the other diffs. The transformation summary has details about the changes I'm proposing.
 codemodernizer.chat.message.result.zip_too_large=Sorry, your project size exceeds the Amazon Q Code Transformation upload limit of 2GB.
 codemodernizer.chat.message.resume_ongoing=I'm still transforming your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your module. To monitor progress, go to the Transformation Hub.
 codemodernizer.chat.message.skip_tests=I will build your project using `mvn clean test` by default. If you would like me to build your project without running unit tests, I will use `mvn clean test-compile`.
diff --git a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt
index 82951c22738..7fe70ccb337 100644
--- a/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt
+++ b/ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/transformTests/TransformChatTest.kt
@@ -71,16 +71,6 @@ async function testNavigation() {
                 const button = document.querySelector('button[action-id="codetransform-input-confirm-skip-tests"]')
                 button.click()
             })
-            
-            const oneOrMultipleDiffsForm = await page.waitForSelector('button[action-id="codetransform-input-confirm-one-or-multiple-diffs"]', {
-                timeout: 5000
-            })
-            console.log('One or multiple diffs form appeared:', oneOrMultipleDiffsForm !== null)
-            
-            await page.evaluate(() => {
-                const button = document.querySelector('button[action-id="codetransform-input-confirm-one-or-multiple-diffs"]')
-                button.click()
-            })
 /*
             const selectCustomVersionsForm = await page.waitForSelector('button[action-id="codetransform-input-confirm-custom-dependency-versions"]', {
                 timeout: 5000
@@ -165,7 +155,6 @@ class TransformChatTest {
                     "Choose a module to transform",
                     "Choose the target code version",
                     "Skip tests form appeared: true",
-                    "One or multiple diffs form appeared: true",
                     "couldn't run the Maven clean install command"
                     // TODO: delete line above, and uncomment lines below when releasing CSB
                     // "I could not find \"dummy-target-jdk-name-here\"",