diff --git a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala
index e7ad9b762..43a07ecb3 100644
--- a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala
+++ b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/ExternalIvyConfigurationFormats.scala
@@ -5,63 +5,33 @@
 // DO NOT EDIT MANUALLY
 package sbt.librarymanagement.ivy
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
-trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat
-    with sbt.internal.librarymanagement.formats.LoggerFormat
-    with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat
-    with sbt.librarymanagement.ModuleIDFormats
-    with sbt.librarymanagement.ResolverFormats
-    with sjsonnew.BasicJsonProtocol
-    with sbt.librarymanagement.ArtifactFormats
-    with sbt.librarymanagement.ConfigRefFormats
-    with sbt.librarymanagement.ChecksumFormats
-    with sbt.librarymanagement.InclExclRuleFormats
-    with sbt.librarymanagement.CrossVersionFormats
-    with sbt.librarymanagement.DisabledFormats
-    with sbt.librarymanagement.BinaryFormats
-    with sbt.librarymanagement.ConstantFormats
-    with sbt.librarymanagement.PatchFormats
-    with sbt.librarymanagement.FullFormats
-    with sbt.librarymanagement.For3Use2_13Formats
-    with sbt.librarymanagement.For2_13Use3Formats
-    with sbt.librarymanagement.ChainedResolverFormats
-    with sbt.librarymanagement.MavenRepoFormats
-    with sbt.librarymanagement.MavenCacheFormats
-    with sbt.librarymanagement.PatternsFormats
-    with sbt.librarymanagement.FileConfigurationFormats
-    with sbt.librarymanagement.FileRepositoryFormats
-    with sbt.librarymanagement.URLRepositoryFormats
-    with sbt.librarymanagement.SshConnectionFormats
-    with sbt.librarymanagement.SshAuthenticationFormats
-    with sbt.librarymanagement.SshRepositoryFormats
-    with sbt.librarymanagement.SftpRepositoryFormats
-    with sbt.librarymanagement.PasswordAuthenticationFormats
-    with sbt.librarymanagement.KeyFileAuthenticationFormats =>
-    implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] {
-      override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.ExternalIvyConfiguration = {
-        __jsOpt match {
-          case Some(__js) =>
-          unbuilder.beginObject(__js)
-          val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock")
-          val log = unbuilder.readField[Option[xsbti.Logger]]("log")
-          val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions")
-          val baseDirectory = unbuilder.readField[Option[java.io.File]]("baseDirectory")
-          val uri = unbuilder.readField[Option[java.net.URI]]("uri")
-          val extraResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("extraResolvers")
-          unbuilder.endObject()
-          sbt.librarymanagement.ivy.ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers)
-          case None =>
-          deserializationError("Expected JsObject but found None")
-        }
-      }
-      override def write[J](obj: sbt.librarymanagement.ivy.ExternalIvyConfiguration, builder: Builder[J]): Unit = {
-        builder.beginObject()
-        builder.addField("lock", obj.lock)
-        builder.addField("log", obj.log)
-        builder.addField("updateOptions", obj.updateOptions)
-        builder.addField("baseDirectory", obj.baseDirectory)
-        builder.addField("uri", obj.uri)
-        builder.addField("extraResolvers", obj.extraResolvers)
-        builder.endObject()
-      }
+trait ExternalIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ResolverFormats with sjsonnew.BasicJsonProtocol =>
+implicit lazy val ExternalIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.ExternalIvyConfiguration] {
+  override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.ExternalIvyConfiguration = {
+    __jsOpt match {
+      case Some(__js) =>
+      unbuilder.beginObject(__js)
+      val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock")
+      val log = unbuilder.readField[Option[xsbti.Logger]]("log")
+      val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions")
+      val baseDirectory = unbuilder.readField[Option[java.io.File]]("baseDirectory")
+      val uri = unbuilder.readField[Option[java.net.URI]]("uri")
+      val extraResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("extraResolvers")
+      unbuilder.endObject()
+      sbt.librarymanagement.ivy.ExternalIvyConfiguration(lock, log, updateOptions, baseDirectory, uri, extraResolvers)
+      case None =>
+      deserializationError("Expected JsObject but found None")
     }
+  }
+  override def write[J](obj: sbt.librarymanagement.ivy.ExternalIvyConfiguration, builder: Builder[J]): Unit = {
+    builder.beginObject()
+    builder.addField("lock", obj.lock)
+    builder.addField("log", obj.log)
+    builder.addField("updateOptions", obj.updateOptions)
+    builder.addField("baseDirectory", obj.baseDirectory)
+    builder.addField("uri", obj.uri)
+    builder.addField("extraResolvers", obj.extraResolvers)
+    builder.endObject()
+  }
+}
 }
diff --git a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala
index 0386a8d84..801b93901 100644
--- a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala
+++ b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/InlineIvyConfigurationFormats.scala
@@ -5,73 +5,41 @@
 // DO NOT EDIT MANUALLY
 package sbt.librarymanagement.ivy
 import _root_.sjsonnew.{ Unbuilder, Builder, JsonFormat, deserializationError }
-trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat
-    with sbt.internal.librarymanagement.formats.LoggerFormat
-    with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat
-    with sbt.librarymanagement.ivy.IvyPathsFormats
-    with sjsonnew.BasicJsonProtocol
-    with sbt.librarymanagement.ModuleIDFormats
-    with sbt.librarymanagement.ResolverFormats
-    with sbt.librarymanagement.ModuleConfigurationFormats
-    with sbt.librarymanagement.ArtifactFormats
-    with sbt.librarymanagement.ConfigRefFormats
-    with sbt.librarymanagement.ChecksumFormats
-    with sbt.librarymanagement.InclExclRuleFormats
-    with sbt.librarymanagement.CrossVersionFormats
-    with sbt.librarymanagement.DisabledFormats
-    with sbt.librarymanagement.BinaryFormats
-    with sbt.librarymanagement.ConstantFormats
-    with sbt.librarymanagement.PatchFormats
-    with sbt.librarymanagement.FullFormats
-    with sbt.librarymanagement.For3Use2_13Formats
-    with sbt.librarymanagement.For2_13Use3Formats
-    with sbt.librarymanagement.ChainedResolverFormats
-    with sbt.librarymanagement.MavenRepoFormats
-    with sbt.librarymanagement.MavenCacheFormats
-    with sbt.librarymanagement.PatternsFormats
-    with sbt.librarymanagement.FileConfigurationFormats
-    with sbt.librarymanagement.FileRepositoryFormats
-    with sbt.librarymanagement.URLRepositoryFormats
-    with sbt.librarymanagement.SshConnectionFormats
-    with sbt.librarymanagement.SshAuthenticationFormats
-    with sbt.librarymanagement.SshRepositoryFormats
-    with sbt.librarymanagement.SftpRepositoryFormats
-    with sbt.librarymanagement.PasswordAuthenticationFormats
-    with sbt.librarymanagement.KeyFileAuthenticationFormats =>
-    implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] {
-      override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.InlineIvyConfiguration = {
-        __jsOpt match {
-          case Some(__js) =>
-          unbuilder.beginObject(__js)
-          val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock")
-          val log = unbuilder.readField[Option[xsbti.Logger]]("log")
-          val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions")
-          val paths = unbuilder.readField[Option[sbt.librarymanagement.ivy.IvyPaths]]("paths")
-          val resolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("resolvers")
-          val otherResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("otherResolvers")
-          val moduleConfigurations = unbuilder.readField[Vector[sbt.librarymanagement.ModuleConfiguration]]("moduleConfigurations")
-          val checksums = unbuilder.readField[Vector[String]]("checksums")
-          val managedChecksums = unbuilder.readField[Boolean]("managedChecksums")
-          val resolutionCacheDir = unbuilder.readField[Option[java.io.File]]("resolutionCacheDir")
-          unbuilder.endObject()
-          sbt.librarymanagement.ivy.InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir)
-          case None =>
-          deserializationError("Expected JsObject but found None")
-        }
-      }
-      override def write[J](obj: sbt.librarymanagement.ivy.InlineIvyConfiguration, builder: Builder[J]): Unit = {
-        builder.beginObject()
-        builder.addField("lock", obj.lock)
-        builder.addField("log", obj.log)
-        builder.addField("updateOptions", obj.updateOptions)
-        builder.addField("paths", obj.paths)
-        builder.addField("resolvers", obj.resolvers)
-        builder.addField("otherResolvers", obj.otherResolvers)
-        builder.addField("moduleConfigurations", obj.moduleConfigurations)
-        builder.addField("checksums", obj.checksums)
-        builder.addField("managedChecksums", obj.managedChecksums)
-        builder.addField("resolutionCacheDir", obj.resolutionCacheDir)
-        builder.endObject()
-      }
+trait InlineIvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ivy.IvyPathsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ResolverFormats with sbt.librarymanagement.ModuleConfigurationFormats =>
+implicit lazy val InlineIvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] = new JsonFormat[sbt.librarymanagement.ivy.InlineIvyConfiguration] {
+  override def read[J](__jsOpt: Option[J], unbuilder: Unbuilder[J]): sbt.librarymanagement.ivy.InlineIvyConfiguration = {
+    __jsOpt match {
+      case Some(__js) =>
+      unbuilder.beginObject(__js)
+      val lock = unbuilder.readField[Option[xsbti.GlobalLock]]("lock")
+      val log = unbuilder.readField[Option[xsbti.Logger]]("log")
+      val updateOptions = unbuilder.readField[sbt.librarymanagement.ivy.UpdateOptions]("updateOptions")
+      val paths = unbuilder.readField[Option[sbt.librarymanagement.ivy.IvyPaths]]("paths")
+      val resolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("resolvers")
+      val otherResolvers = unbuilder.readField[Vector[sbt.librarymanagement.Resolver]]("otherResolvers")
+      val moduleConfigurations = unbuilder.readField[Vector[sbt.librarymanagement.ModuleConfiguration]]("moduleConfigurations")
+      val checksums = unbuilder.readField[Vector[String]]("checksums")
+      val managedChecksums = unbuilder.readField[Boolean]("managedChecksums")
+      val resolutionCacheDir = unbuilder.readField[Option[java.io.File]]("resolutionCacheDir")
+      unbuilder.endObject()
+      sbt.librarymanagement.ivy.InlineIvyConfiguration(lock, log, updateOptions, paths, resolvers, otherResolvers, moduleConfigurations, checksums, managedChecksums, resolutionCacheDir)
+      case None =>
+      deserializationError("Expected JsObject but found None")
     }
+  }
+  override def write[J](obj: sbt.librarymanagement.ivy.InlineIvyConfiguration, builder: Builder[J]): Unit = {
+    builder.beginObject()
+    builder.addField("lock", obj.lock)
+    builder.addField("log", obj.log)
+    builder.addField("updateOptions", obj.updateOptions)
+    builder.addField("paths", obj.paths)
+    builder.addField("resolvers", obj.resolvers)
+    builder.addField("otherResolvers", obj.otherResolvers)
+    builder.addField("moduleConfigurations", obj.moduleConfigurations)
+    builder.addField("checksums", obj.checksums)
+    builder.addField("managedChecksums", obj.managedChecksums)
+    builder.addField("resolutionCacheDir", obj.resolutionCacheDir)
+    builder.endObject()
+  }
+}
 }
diff --git a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala
index 2069fe236..b9ec1469d 100644
--- a/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala
+++ b/lm-ivy/src/main/contraband-scala/sbt/librarymanagement/ivy/IvyConfigurationFormats.scala
@@ -6,40 +6,6 @@
 package sbt.librarymanagement.ivy
 
 import _root_.sjsonnew.JsonFormat
-trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat
-    with sbt.internal.librarymanagement.formats.LoggerFormat
-    with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat
-    with sbt.librarymanagement.ivy.IvyPathsFormats
-    with sbt.librarymanagement.ModuleIDFormats
-    with sjsonnew.BasicJsonProtocol
-    with sbt.librarymanagement.ResolverFormats
-    with sbt.librarymanagement.ModuleConfigurationFormats
-    with sbt.librarymanagement.ivy.InlineIvyConfigurationFormats
-    with sbt.librarymanagement.ivy.ExternalIvyConfigurationFormats
-    with sbt.librarymanagement.ArtifactFormats
-    with sbt.librarymanagement.ConfigRefFormats
-    with sbt.librarymanagement.ChecksumFormats
-    with sbt.librarymanagement.InclExclRuleFormats
-    with sbt.librarymanagement.CrossVersionFormats
-    with sbt.librarymanagement.DisabledFormats
-    with sbt.librarymanagement.BinaryFormats
-    with sbt.librarymanagement.ConstantFormats
-    with sbt.librarymanagement.PatchFormats
-    with sbt.librarymanagement.FullFormats
-    with sbt.librarymanagement.For3Use2_13Formats
-    with sbt.librarymanagement.For2_13Use3Formats
-    with sbt.librarymanagement.ChainedResolverFormats
-    with sbt.librarymanagement.MavenRepoFormats
-    with sbt.librarymanagement.MavenCacheFormats
-    with sbt.librarymanagement.PatternsFormats
-    with sbt.librarymanagement.FileConfigurationFormats
-    with sbt.librarymanagement.FileRepositoryFormats
-    with sbt.librarymanagement.URLRepositoryFormats
-    with sbt.librarymanagement.SshConnectionFormats
-    with sbt.librarymanagement.SshAuthenticationFormats
-    with sbt.librarymanagement.SshRepositoryFormats
-    with sbt.librarymanagement.SftpRepositoryFormats
-    with sbt.librarymanagement.PasswordAuthenticationFormats
-    with sbt.librarymanagement.KeyFileAuthenticationFormats =>
-    implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.librarymanagement.ivy.IvyConfiguration, sbt.librarymanagement.ivy.InlineIvyConfiguration, sbt.librarymanagement.ivy.ExternalIvyConfiguration]("type")
+trait IvyConfigurationFormats { self: sbt.internal.librarymanagement.formats.GlobalLockFormat with sbt.internal.librarymanagement.formats.LoggerFormat with sbt.librarymanagement.ivy.formats.UpdateOptionsFormat with sbt.librarymanagement.ivy.IvyPathsFormats with sjsonnew.BasicJsonProtocol with sbt.librarymanagement.ResolverFormats with sbt.librarymanagement.ModuleConfigurationFormats with sbt.librarymanagement.ivy.InlineIvyConfigurationFormats with sbt.librarymanagement.ivy.ExternalIvyConfigurationFormats =>
+implicit lazy val IvyConfigurationFormat: JsonFormat[sbt.librarymanagement.ivy.IvyConfiguration] = flatUnionFormat2[sbt.librarymanagement.ivy.IvyConfiguration, sbt.librarymanagement.ivy.InlineIvyConfiguration, sbt.librarymanagement.ivy.ExternalIvyConfiguration]("type")
 }