diff --git a/src/main/scala/util/Config.scala b/src/main/scala/config/Config.scala
similarity index 100%
rename from src/main/scala/util/Config.scala
rename to src/main/scala/config/Config.scala
diff --git a/src/main/scala/coreplex/Configs.scala b/src/main/scala/coreplex/Configs.scala
index 475ad5b1..a3b63b9d 100644
--- a/src/main/scala/coreplex/Configs.scala
+++ b/src/main/scala/coreplex/Configs.scala
@@ -4,8 +4,10 @@
 package coreplex
 
 import Chisel._
-import junctions._
+import config._
 import diplomacy._
+import junctions.PAddrBits
+import rocket._
 import uncore.tilelink._
 import uncore.tilelink2._
 import uncore.coherence._
@@ -13,10 +15,7 @@ import uncore.agents._
 import uncore.devices._
 import uncore.converters._
 import uncore.util._
-import rocket._
 import util._
-import util.ConfigUtils._
-import config._
 
 class BaseCoreplexConfig extends Config (
   { (pname,site,here) =>
@@ -95,11 +94,11 @@ class BaseCoreplexConfig extends Config (
           nManagers = site(BankedL2Config).nBanks + 1 /* MMIO */,
           nCachingClients = 1,
           nCachelessClients = 1,
-          maxClientXacts = max_int(
+          maxClientXacts = List(
               // L1 cache
               site(DCacheKey).nMSHRs + 1 /* IOMSHR */,
               // RoCC
-              if (site(BuildRoCC).isEmpty) 1 else site(RoccMaxTaggedMemXacts)),
+              if (site(BuildRoCC).isEmpty) 1 else site(RoccMaxTaggedMemXacts)).max,
           maxClientsPerPort = if (site(BuildRoCC).isEmpty) 1 else 2,
           maxManagerXacts = site(NAcquireTransactors) + 2,
           dataBeats = innerDataBeats,
diff --git a/src/main/scala/groundtest/Configs.scala b/src/main/scala/groundtest/Configs.scala
index 5298be97..45cd5a79 100644
--- a/src/main/scala/groundtest/Configs.scala
+++ b/src/main/scala/groundtest/Configs.scala
@@ -16,7 +16,6 @@ import config._
 import scala.math.max
 import coreplex._
 import rocketchip._
-import util.ConfigUtils._
 
 /** Actual testing target Configs */
 
diff --git a/src/main/scala/util/ConfigUtils.scala b/src/main/scala/util/ConfigUtils.scala
deleted file mode 100644
index ff5d42ce..00000000
--- a/src/main/scala/util/ConfigUtils.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-// See LICENSE.Berkeley for license details.
-
-package util
-
-import scala.math.max
-
-object ConfigUtils {
-  def max_int(values: Int*): Int = {
-    values.reduce((a, b) => max(a, b))
-  }
-}