diff --git a/app/controllers/Coach.scala b/app/controllers/Coach.scala
index cd13d0c85b0e..2fdbbd399bff 100644
--- a/app/controllers/Coach.scala
+++ b/app/controllers/Coach.scala
@@ -107,7 +107,7 @@ object Coach extends LilaController {
     OptionFuResult(api findOrInit me) { c =>
       ctx.body.body.file("picture") match {
         case Some(pic) => api.uploadPicture(c, pic) recover {
-          case e: lila.common.LilaException => BadRequest(html.coach.picture(c, e.message.some))
+          case e: lila.base.LilaException => BadRequest(html.coach.picture(c, e.message.some))
         } inject Redirect(routes.Coach.edit)
         case None => fuccess(Redirect(routes.Coach.edit))
       }
diff --git a/app/package.scala b/app/package.scala
index 890b6a113e34..a38045b55388 100644
--- a/app/package.scala
+++ b/app/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object app extends PackageObject with WithPlay with socket.WithSocket
+package object app extends PackageObject with socket.WithSocket
diff --git a/app/views/activity/ActivityHtml.scala b/app/views/activity/ActivityHtml.scala
index 14e4492f0b7c..7c4c4716cc0e 100644
--- a/app/views/activity/ActivityHtml.scala
+++ b/app/views/activity/ActivityHtml.scala
@@ -8,7 +8,7 @@ import lila.api.Context
 import lila.i18n.{ I18nKey, I18nKeys => trans }
 import lila.app.templating.Environment._
 
-object ActivityHtml extends lila.Steroids {
+object ActivityHtml extends lila.Lilaisms {
 
   def scoreHtml(s: Score)(implicit ctx: Context) = Html {
     s"""<score>${scorePart("win", s.win, trans.nbWins)}${scorePart("draw", s.draw, trans.nbDraws)}${scorePart("loss", s.loss, trans.nbLosses)}</score>"""
diff --git a/app/views/board/JsData.scala b/app/views/board/JsData.scala
index 4e595e5681cb..32055479349d 100644
--- a/app/views/board/JsData.scala
+++ b/app/views/board/JsData.scala
@@ -8,7 +8,7 @@ import lila.api.Context
 import lila.app.templating.Environment._
 import lila.i18n.I18nKeys
 
-object JsData extends lila.Steroids {
+object JsData extends lila.Lilaisms {
 
   def apply(
     sit: chess.Situation,
diff --git a/modules/activity/src/main/package.scala b/modules/activity/src/main/package.scala
index a1d1d23b1e8d..0faff683dc9e 100644
--- a/modules/activity/src/main/package.scala
+++ b/modules/activity/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object activity extends PackageObject with WithPlay {
+package object activity extends PackageObject {
 
   private[activity] val logger = lila.log("activity")
 }
diff --git a/modules/analyse/src/main/Env.scala b/modules/analyse/src/main/Env.scala
index cd7ece2809a8..6899e0f492d4 100644
--- a/modules/analyse/src/main/Env.scala
+++ b/modules/analyse/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.analyse
 import akka.actor._
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,
diff --git a/modules/analyse/src/main/package.scala b/modules/analyse/src/main/package.scala
index 08d552a8df22..b8a05394f6f7 100644
--- a/modules/analyse/src/main/package.scala
+++ b/modules/analyse/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object analyse extends PackageObject with WithPlay {
+package object analyse extends PackageObject {
 
   type InfoAdvices = List[(Info, Option[Advice])]
 
diff --git a/modules/api/src/main/Env.scala b/modules/api/src/main/Env.scala
index e906f1295f35..6ff89781a3d6 100644
--- a/modules/api/src/main/Env.scala
+++ b/modules/api/src/main/Env.scala
@@ -2,7 +2,7 @@ package lila.api
 
 import akka.actor._
 import com.typesafe.config.Config
-import lila.common.PimpedConfig._
+
 import lila.simul.Simul
 
 final class Env(
diff --git a/modules/api/src/main/package.scala b/modules/api/src/main/package.scala
index feced66b6f15..c1fa6213f416 100644
--- a/modules/api/src/main/package.scala
+++ b/modules/api/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object api extends PackageObject with WithPlay
+package object api extends PackageObject
diff --git a/modules/blog/src/main/Env.scala b/modules/blog/src/main/Env.scala
index 3c0bc357e081..7b31e5207e17 100644
--- a/modules/blog/src/main/Env.scala
+++ b/modules/blog/src/main/Env.scala
@@ -2,8 +2,6 @@ package lila.blog
 
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     scheduler: lila.common.Scheduler,
diff --git a/modules/blog/src/main/package.scala b/modules/blog/src/main/package.scala
index 50bb0b2f9b12..5d86200a8312 100644
--- a/modules/blog/src/main/package.scala
+++ b/modules/blog/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object blog extends PackageObject with WithPlay {
+package object blog extends PackageObject {
 
   private[blog] def logger = lila.log("blog")
 }
diff --git a/modules/bookmark/src/main/package.scala b/modules/bookmark/src/main/package.scala
index c2b938bf74a0..4d7a8144c97d 100644
--- a/modules/bookmark/src/main/package.scala
+++ b/modules/bookmark/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object bookmark extends PackageObject with WithPlay
+package object bookmark extends PackageObject
diff --git a/modules/challenge/src/main/Env.scala b/modules/challenge/src/main/Env.scala
index 06d681d44727..28a01bb63b09 100644
--- a/modules/challenge/src/main/Env.scala
+++ b/modules/challenge/src/main/Env.scala
@@ -5,7 +5,6 @@ import akka.pattern.ask
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
 import lila.user.User
 import lila.hub.actorApi.map.Ask
 import lila.socket.actorApi.GetVersion
diff --git a/modules/challenge/src/main/package.scala b/modules/challenge/src/main/package.scala
index 25b935eb94be..1504180a3e65 100644
--- a/modules/challenge/src/main/package.scala
+++ b/modules/challenge/src/main/package.scala
@@ -4,7 +4,7 @@ import org.joda.time.DateTime
 
 import lila.socket.WithSocket
 
-package object challenge extends PackageObject with WithPlay with WithSocket {
+package object challenge extends PackageObject with WithSocket {
 
   type EitherChallenger = Either[Challenge.Anonymous, Challenge.Registered]
 
diff --git a/modules/chat/src/main/Env.scala b/modules/chat/src/main/Env.scala
index 9563ff3f493b..abd75e40746e 100644
--- a/modules/chat/src/main/Env.scala
+++ b/modules/chat/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.chat
 import akka.actor.{ ActorSystem, Props, ActorSelection }
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,
diff --git a/modules/chat/src/main/package.scala b/modules/chat/src/main/package.scala
index 0e63ddd78164..11c8c04fc172 100644
--- a/modules/chat/src/main/package.scala
+++ b/modules/chat/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object chat extends PackageObject with WithPlay {
+package object chat extends PackageObject {
 
   private[chat] val systemUserId = "lichess"
 }
diff --git a/modules/coach/src/main/package.scala b/modules/coach/src/main/package.scala
index 888c5e949e6f..fc290f9c7290 100644
--- a/modules/coach/src/main/package.scala
+++ b/modules/coach/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object coach extends PackageObject with WithPlay {
+package object coach extends PackageObject {
 
   private[coach] def logger = lila.log("coach")
 }
diff --git a/modules/common/src/main/LilaException.scala b/modules/common/src/main/LilaException.scala
deleted file mode 100644
index c1ded319bc0e..000000000000
--- a/modules/common/src/main/LilaException.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package lila.common
-
-import ornicar.scalalib
-
-trait LilaException extends Exception {
-  val message: String
-
-  override def getMessage = message
-  override def toString = message
-}
-
-object LilaException extends scalalib.Validation {
-
-  def apply(msg: String): LilaException = new LilaException {
-    val message = msg
-  }
-
-  def apply(msg: Failures): LilaException = apply(msg.shows)
-}
-
-trait ValidException extends LilaException {
-  val message: String
-
-  override def getMessage: String = "LilaValid['" + message + "']"
-}
-
-object ValidException extends scalalib.Validation {
-
-  def apply(msg: String): ValidException = new ValidException {
-    val message = msg
-  }
-
-  def apply(msg: Failures): ValidException = apply(msg.shows)
-}
diff --git a/modules/common/src/main/Steroids.scala b/modules/common/src/main/Lilaisms.scala
similarity index 99%
rename from modules/common/src/main/Steroids.scala
rename to modules/common/src/main/Lilaisms.scala
index 86a22fa2140b..458de845cb86 100644
--- a/modules/common/src/main/Steroids.scala
+++ b/modules/common/src/main/Lilaisms.scala
@@ -5,7 +5,7 @@ import ornicar.scalalib
 import ornicar.scalalib.Zero
 import scala.util.Try
 
-trait Steroids
+trait Lilaisms
 
   extends scalalib.Validation
   with scalalib.Common
diff --git a/modules/common/src/main/PackageObject.scala b/modules/common/src/main/PackageObject.scala
index a15c1b7a4b7b..41b307f371cb 100644
--- a/modules/common/src/main/PackageObject.scala
+++ b/modules/common/src/main/PackageObject.scala
@@ -6,7 +6,7 @@ import scala.concurrent.Future
 import ornicar.scalalib
 import scalaz.{ Monad, Monoid, OptionT, ~> }
 
-trait PackageObject extends Steroids with WithFuture {
+trait PackageObject extends Lilaisms with WithFuture {
 
   // case object Key(value: String) extends AnyVal with StringValue
   trait StringValue extends Any {
@@ -86,21 +86,6 @@ trait PackageObject extends Steroids with WithFuture {
 
   def doubleBox(in: Range.Inclusive)(v: Double): Double =
     math.max(in.start, math.min(v, in.end))
-}
-
-trait WithFuture extends scalalib.Validation {
-
-  type Fu[+A] = Future[A]
-  type Funit = Fu[Unit]
-
-  def fuccess[A](a: A) = Future successful a
-  def fufail[A <: Throwable, B](a: A): Fu[B] = Future failed a
-  def fufail[A](a: String): Fu[A] = fufail(common.LilaException(a))
-  def fufail[A](a: Failures): Fu[A] = fufail(common.LilaException(a))
-  val funit = fuccess(())
-}
-
-trait WithPlay { self: PackageObject =>
 
   import play.api.libs.json._
   import scalalib.Zero
@@ -134,13 +119,15 @@ trait WithPlay { self: PackageObject =>
       Future sequence t
   }
 
+  implicit def toPimpedConfig(c: com.typesafe.config.Config) = new common.LilaPimpedConfig(c)
+
   implicit def LilaPimpedFuture[A](fua: Fu[A]): PimpedFuture.LilaPimpedFuture[A] =
     new PimpedFuture.LilaPimpedFuture(fua)
 
   implicit final class LilaPimpedFutureZero[A: Zero](fua: Fu[A]) {
 
     def nevermind: Fu[A] = fua recover {
-      case e: lila.common.LilaException => zero[A]
+      case e: lila.base.LilaException => zero[A]
       case e: java.util.concurrent.TimeoutException => zero[A]
       case e: Exception =>
         lila.log("common").warn("Future.nevermind", e)
@@ -219,3 +206,15 @@ trait WithPlay { self: PackageObject =>
     def minutes(m: Int): Timeout = Timeout(m.minutes)
   }
 }
+
+trait WithFuture extends scalalib.Validation {
+
+  type Fu[+A] = Future[A]
+  type Funit = Fu[Unit]
+
+  def fuccess[A](a: A) = Future successful a
+  def fufail[A <: Throwable, B](a: A): Fu[B] = Future failed a
+  def fufail[A](a: String): Fu[A] = fufail(base.LilaException(a))
+  def fufail[A](a: Failures): Fu[A] = fufail(base.LilaException(a))
+  val funit = fuccess(())
+}
diff --git a/modules/common/src/main/PimpedConfig.scala b/modules/common/src/main/PimpedConfig.scala
index 4674f0cf1610..045826d52446 100644
--- a/modules/common/src/main/PimpedConfig.scala
+++ b/modules/common/src/main/PimpedConfig.scala
@@ -5,12 +5,9 @@ import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.Config
 
-object PimpedConfig {
+final class LilaPimpedConfig(val config: Config) extends AnyVal {
 
-  implicit final class LilaPimpedConfig(val config: Config) extends AnyVal {
-
-    def millis(name: String): Int = config.getDuration(name, TimeUnit.MILLISECONDS).toInt
-    def seconds(name: String): Int = config.getDuration(name, TimeUnit.SECONDS).toInt
-    def duration(name: String): FiniteDuration = millis(name).millis
-  }
+  def millis(name: String): Int = config.getDuration(name, TimeUnit.MILLISECONDS).toInt
+  def seconds(name: String): Int = config.getDuration(name, TimeUnit.SECONDS).toInt
+  def duration(name: String): FiniteDuration = millis(name).millis
 }
diff --git a/modules/common/src/main/PimpedFuture.scala b/modules/common/src/main/PimpedFuture.scala
index 3878308916b9..7c3712f69cb5 100644
--- a/modules/common/src/main/PimpedFuture.scala
+++ b/modules/common/src/main/PimpedFuture.scala
@@ -82,7 +82,7 @@ object PimpedFuture {
     }
 
     def prefixFailure(p: => String) = mapFailure { e =>
-      common.LilaException(s"$p ${e.getMessage}")
+      base.LilaException(s"$p ${e.getMessage}")
     }
 
     def thenPp: Fu[A] = {
diff --git a/modules/common/src/main/base/LilaException.scala b/modules/common/src/main/base/LilaException.scala
new file mode 100644
index 000000000000..7a81eda3f8f4
--- /dev/null
+++ b/modules/common/src/main/base/LilaException.scala
@@ -0,0 +1,20 @@
+package lila.base
+
+import ornicar.scalalib
+
+trait LilaException extends Exception {
+  val message: String
+
+  override def getMessage = message
+  override def toString = message
+}
+
+object LilaException extends scalalib.Validation
+  with scalaz.syntax.ToShowOps {
+
+  def apply(msg: String): LilaException = new LilaException {
+    val message = msg
+  }
+
+  def apply(msg: Failures): LilaException = apply(msg.shows)
+}
\ No newline at end of file
diff --git a/modules/common/src/main/package.scala b/modules/common/src/main/package.scala
index 0f32d4ed443b..6d70b2150e1a 100644
--- a/modules/common/src/main/package.scala
+++ b/modules/common/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object common extends PackageObject with WithPlay
+package object common extends PackageObject
diff --git a/modules/coordinate/src/main/package.scala b/modules/coordinate/src/main/package.scala
index 78a87b4c26ee..43008c2f590d 100644
--- a/modules/coordinate/src/main/package.scala
+++ b/modules/coordinate/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object coordinate extends PackageObject with WithPlay
+package object coordinate extends PackageObject
diff --git a/modules/db/src/main/package.scala b/modules/db/src/main/package.scala
index e01841c641c1..c824c33dcacb 100644
--- a/modules/db/src/main/package.scala
+++ b/modules/db/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import reactivemongo.api.commands.WriteResult
 
-package object db extends PackageObject with WithPlay {
+package object db extends PackageObject {
 
   def recoverDuplicateKey[A](f: WriteResult => A): PartialFunction[Throwable, A] = {
     case e: WriteResult if e.code.contains(11000) => f(e)
diff --git a/modules/evalCache/src/main/package.scala b/modules/evalCache/src/main/package.scala
index 6c7144cf651d..746c6a7240f7 100644
--- a/modules/evalCache/src/main/package.scala
+++ b/modules/evalCache/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object evalCache extends PackageObject with WithPlay {
+package object evalCache extends PackageObject {
 
   private[evalCache] val logger = lila.log("evalCache")
 }
diff --git a/modules/evaluation/src/main/package.scala b/modules/evaluation/src/main/package.scala
index 5a9efb067310..fc5109459c10 100644
--- a/modules/evaluation/src/main/package.scala
+++ b/modules/evaluation/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object evaluation extends PackageObject with WithPlay
+package object evaluation extends PackageObject
diff --git a/modules/event/src/main/package.scala b/modules/event/src/main/package.scala
index 9b29a68ba068..72c897d3928c 100644
--- a/modules/event/src/main/package.scala
+++ b/modules/event/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object event extends PackageObject with WithPlay
+package object event extends PackageObject
diff --git a/modules/explorer/src/main/package.scala b/modules/explorer/src/main/package.scala
index 99b95b1f4844..0d476113a821 100644
--- a/modules/explorer/src/main/package.scala
+++ b/modules/explorer/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object explorer extends PackageObject with WithPlay {
+package object explorer extends PackageObject {
 
   val maxPlies = 50
 }
diff --git a/modules/fishnet/src/main/AnalysisBuilder.scala b/modules/fishnet/src/main/AnalysisBuilder.scala
index 76abc177882d..1b118d68acec 100644
--- a/modules/fishnet/src/main/AnalysisBuilder.scala
+++ b/modules/fishnet/src/main/AnalysisBuilder.scala
@@ -72,7 +72,7 @@ private object AnalysisBuilder {
       case ((_, _), index) => Info(index + 1 + startedAtPly, Eval.empty)
     }
 
-  case class GameIsGone(id: String) extends lila.common.LilaException {
+  case class GameIsGone(id: String) extends lila.base.LilaException {
     val message = s"Analysis $id game is gone?!"
   }
 }
diff --git a/modules/fishnet/src/main/FishnetApi.scala b/modules/fishnet/src/main/FishnetApi.scala
index 619cdf216d3c..43eb9aed551d 100644
--- a/modules/fishnet/src/main/FishnetApi.scala
+++ b/modules/fishnet/src/main/FishnetApi.scala
@@ -171,7 +171,7 @@ final class FishnetApi(
 
 object FishnetApi {
 
-  import lila.common.LilaException
+  import lila.base.LilaException
 
   case object WeakAnalysis extends LilaException {
     val message = "Analysis nodes per move is too low"
diff --git a/modules/fishnet/src/main/UciToPgn.scala b/modules/fishnet/src/main/UciToPgn.scala
index 65228afae65c..86b7034409b3 100644
--- a/modules/fishnet/src/main/UciToPgn.scala
+++ b/modules/fishnet/src/main/UciToPgn.scala
@@ -7,7 +7,7 @@ import scalaz.Validation.success
 import scalaz.Validation.FlatMap._
 
 import lila.analyse.{ Analysis, Info, PgnMove }
-import lila.common.LilaException
+import lila.base.LilaException
 
 // convert variations from UCI to PGN.
 // also drops extra variations
diff --git a/modules/fishnet/src/main/package.scala b/modules/fishnet/src/main/package.scala
index 722dd6eea33b..801b8c84f598 100644
--- a/modules/fishnet/src/main/package.scala
+++ b/modules/fishnet/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object fishnet extends PackageObject with WithPlay {
+package object fishnet extends PackageObject {
 
   private[fishnet] def logger = lila.log("fishnet")
 }
diff --git a/modules/forum/src/main/Env.scala b/modules/forum/src/main/Env.scala
index 626589af1052..a1d51b8f190b 100644
--- a/modules/forum/src/main/Env.scala
+++ b/modules/forum/src/main/Env.scala
@@ -4,7 +4,7 @@ import akka.actor._
 import com.typesafe.config.Config
 
 import lila.common.DetectLanguage
-import lila.common.PimpedConfig._
+
 import lila.hub.actorApi.team.CreateTeam
 import lila.mod.ModlogApi
 import lila.notify.NotifyApi
diff --git a/modules/forum/src/main/package.scala b/modules/forum/src/main/package.scala
index 69b562fe3338..7e1ba2c7f897 100644
--- a/modules/forum/src/main/package.scala
+++ b/modules/forum/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object forum extends PackageObject with WithPlay {
+package object forum extends PackageObject {
 
   private[forum] def teamSlug(id: String) = s"team-$id"
 
diff --git a/modules/forumSearch/src/main/package.scala b/modules/forumSearch/src/main/package.scala
index 4bac46baf3b0..fd048f49ba11 100644
--- a/modules/forumSearch/src/main/package.scala
+++ b/modules/forumSearch/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object forumSearch extends PackageObject with WithPlay {
+package object forumSearch extends PackageObject {
 
   private[forumSearch] val logger = lila.log("forumSearch")
 }
diff --git a/modules/game/src/main/Env.scala b/modules/game/src/main/Env.scala
index 5a32f7a30403..41b7c9b78561 100644
--- a/modules/game/src/main/Env.scala
+++ b/modules/game/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.game
 import akka.actor._
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,
diff --git a/modules/game/src/main/package.scala b/modules/game/src/main/package.scala
index 1bf08c58f2d2..f6eabc3c74a4 100644
--- a/modules/game/src/main/package.scala
+++ b/modules/game/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object game extends PackageObject with WithPlay {
+package object game extends PackageObject {
 
   type PgnMoves = Vector[String]
   type RatingDiffs = chess.Color.Map[Int]
diff --git a/modules/gameSearch/src/main/package.scala b/modules/gameSearch/src/main/package.scala
index 64192974eca9..3bd28288e3f4 100644
--- a/modules/gameSearch/src/main/package.scala
+++ b/modules/gameSearch/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object gameSearch extends PackageObject with WithPlay {
+package object gameSearch extends PackageObject {
 
   private[gameSearch] def logger = lila.log("gameSearch")
 }
diff --git a/modules/history/src/main/Env.scala b/modules/history/src/main/Env.scala
index a239a71be6b4..3616d3f6a1de 100644
--- a/modules/history/src/main/Env.scala
+++ b/modules/history/src/main/Env.scala
@@ -1,7 +1,6 @@
 package lila.history
 
 import com.typesafe.config.Config
-import lila.common.PimpedConfig._
 
 final class Env(
     config: Config,
diff --git a/modules/history/src/main/package.scala b/modules/history/src/main/package.scala
index 7861c9467072..14293ffdae47 100644
--- a/modules/history/src/main/package.scala
+++ b/modules/history/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object history extends PackageObject with WithPlay {
+package object history extends PackageObject {
 
   private[history] type ID = String
 
diff --git a/modules/hub/src/main/EarlyMultiThrottler.scala b/modules/hub/src/main/EarlyMultiThrottler.scala
index dd10986da219..d736d1220f69 100644
--- a/modules/hub/src/main/EarlyMultiThrottler.scala
+++ b/modules/hub/src/main/EarlyMultiThrottler.scala
@@ -46,7 +46,7 @@ final class EarlyMultiThrottler(
       work.timeout.orElse(executionTimeout).fold(work.run()) { timeout =>
         work.run().withTimeout(
           duration = timeout,
-          error = lila.common.LilaException(s"EarlyMultiThrottler timed out after $timeout")
+          error = lila.base.LilaException(s"EarlyMultiThrottler timed out after $timeout")
         )
       }
     }
diff --git a/modules/hub/src/main/FutureSequencer.scala b/modules/hub/src/main/FutureSequencer.scala
index 449b35e37f38..a2d8e6732d39 100644
--- a/modules/hub/src/main/FutureSequencer.scala
+++ b/modules/hub/src/main/FutureSequencer.scala
@@ -29,7 +29,7 @@ object FutureSequencer {
 
   import scala.util.Try
 
-  case class Timeout(duration: FiniteDuration) extends lila.common.LilaException {
+  case class Timeout(duration: FiniteDuration) extends lila.base.LilaException {
     val message = s"FutureSequencer timed out after $duration"
   }
 
diff --git a/modules/hub/src/main/LateMultiThrottler.scala b/modules/hub/src/main/LateMultiThrottler.scala
index 0867989b1895..5f7bd9effb58 100644
--- a/modules/hub/src/main/LateMultiThrottler.scala
+++ b/modules/hub/src/main/LateMultiThrottler.scala
@@ -25,7 +25,7 @@ final class LateMultiThrottler(
         timeoutOption.orElse(executionTimeout).fold(run()) { timeout =>
           run().withTimeout(
             duration = timeout,
-            error = lila.common.LilaException(s"LateMultiThrottler timed out after $timeout")
+            error = lila.base.LilaException(s"LateMultiThrottler timed out after $timeout")
           )
         } addEffectAnyway {
           self ! Done(id)
diff --git a/modules/hub/src/main/Sequencer.scala b/modules/hub/src/main/Sequencer.scala
index b02b52b40653..6b40f289bb65 100644
--- a/modules/hub/src/main/Sequencer.scala
+++ b/modules/hub/src/main/Sequencer.scala
@@ -45,7 +45,7 @@ final class Sequencer(
         val future = timeoutOption.orElse(executionTimeout).fold(run()) { timeout =>
           run().withTimeout(
             duration = timeout,
-            error = lila.common.LilaException(s"Sequencer timed out after $timeout")
+            error = lila.base.LilaException(s"Sequencer timed out after $timeout")
           )(context.system)
         } addEffectAnyway {
           self ! Done
diff --git a/modules/hub/src/main/SequentialActor.scala b/modules/hub/src/main/SequentialActor.scala
index 60585310548b..2d10d6a866bb 100644
--- a/modules/hub/src/main/SequentialActor.scala
+++ b/modules/hub/src/main/SequentialActor.scala
@@ -5,7 +5,7 @@ import scala.util.Try
 
 import akka.actor._
 
-import lila.common.LilaException
+import lila.base.LilaException
 
 trait SequentialActor extends Actor {
 
diff --git a/modules/hub/src/main/SequentialProvider.scala b/modules/hub/src/main/SequentialProvider.scala
index 8dcb9a1a4db5..9224f3f52d91 100644
--- a/modules/hub/src/main/SequentialProvider.scala
+++ b/modules/hub/src/main/SequentialProvider.scala
@@ -6,7 +6,7 @@ import scala.util.Try
 import akka.actor._
 import akka.pattern.pipe
 
-import lila.common.LilaException
+import lila.base.LilaException
 
 trait SequentialProvider extends Actor {
 
diff --git a/modules/hub/src/main/package.scala b/modules/hub/src/main/package.scala
index 43ac6028446c..f7b9d1a4bc30 100644
--- a/modules/hub/src/main/package.scala
+++ b/modules/hub/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object hub extends PackageObject with WithPlay
+package object hub extends PackageObject
diff --git a/modules/i18n/src/main/package.scala b/modules/i18n/src/main/package.scala
index a9e35a154d59..55879cde75cc 100644
--- a/modules/i18n/src/main/package.scala
+++ b/modules/i18n/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import play.api.i18n.Lang
 
-package object i18n extends PackageObject with WithPlay {
+package object i18n extends PackageObject {
 
   type Count = Int
   type MessageKey = String
diff --git a/modules/importer/src/main/Env.scala b/modules/importer/src/main/Env.scala
index 08c1d13a97d9..962d721faa9d 100644
--- a/modules/importer/src/main/Env.scala
+++ b/modules/importer/src/main/Env.scala
@@ -2,8 +2,6 @@ package lila.importer
 
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     scheduler: akka.actor.Scheduler,
diff --git a/modules/importer/src/main/package.scala b/modules/importer/src/main/package.scala
index d72e05f9c8cd..5139c940b6be 100644
--- a/modules/importer/src/main/package.scala
+++ b/modules/importer/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object importer extends PackageObject with WithPlay
+package object importer extends PackageObject
diff --git a/modules/insight/src/main/package.scala b/modules/insight/src/main/package.scala
index 23ba8d4c969e..c3cd31c30ba2 100644
--- a/modules/insight/src/main/package.scala
+++ b/modules/insight/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object insight extends PackageObject with WithPlay {
+package object insight extends PackageObject {
 
   private[insight] def logger = lila.log("insight")
 }
diff --git a/modules/irwin/src/main/package.scala b/modules/irwin/src/main/package.scala
index cbb93740947f..723f22c0d203 100644
--- a/modules/irwin/src/main/package.scala
+++ b/modules/irwin/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object irwin extends PackageObject with WithPlay {
+package object irwin extends PackageObject {
 
   private[irwin] def logger = lila.log("irwin")
 }
diff --git a/modules/learn/src/main/package.scala b/modules/learn/src/main/package.scala
index e1950bdc01bc..0af4776a8018 100644
--- a/modules/learn/src/main/package.scala
+++ b/modules/learn/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object learn extends PackageObject with WithPlay {
+package object learn extends PackageObject {
 
   private[learn] val logger = lila.log("learn")
 }
diff --git a/modules/lobby/src/main/Env.scala b/modules/lobby/src/main/Env.scala
index 2a4341ab6c7c..29cd76e48756 100644
--- a/modules/lobby/src/main/Env.scala
+++ b/modules/lobby/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.lobby
 import akka.actor._
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,
diff --git a/modules/lobby/src/main/package.scala b/modules/lobby/src/main/package.scala
index ccacb527322b..7d6675832740 100644
--- a/modules/lobby/src/main/package.scala
+++ b/modules/lobby/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import lila.socket.WithSocket
 
-package object lobby extends PackageObject with WithPlay with WithSocket {
+package object lobby extends PackageObject with WithSocket {
 
   private[lobby] def logger = lila.log("lobby")
 }
diff --git a/modules/memo/src/main/AsyncCache.scala b/modules/memo/src/main/AsyncCache.scala
index f92c02bd5b46..cd18a56764fa 100644
--- a/modules/memo/src/main/AsyncCache.scala
+++ b/modules/memo/src/main/AsyncCache.scala
@@ -58,7 +58,7 @@ object AsyncCache {
     ) = {
       val safeF = (k: K) => f(k).withTimeout(
         resultTimeout,
-        lila.common.LilaException(s"AsyncCache.multi $name key=$k timed out after $resultTimeout")
+        lila.base.LilaException(s"AsyncCache.multi $name key=$k timed out after $resultTimeout")
       )
       val cache: AsyncLoadingCache[K, V] = makeExpire(
         Scaffeine().maximumSize(maxCapacity),
@@ -78,7 +78,7 @@ object AsyncCache {
       val fullName = s"AsyncCache.clearable $name"
       val safeF = (k: K) => f(k).withTimeout(
         resultTimeout,
-        lila.common.LilaException(s"$fullName key=$k timed out after $resultTimeout")
+        lila.base.LilaException(s"$fullName key=$k timed out after $resultTimeout")
       )
       val cache: Cache[K, Fu[V]] = makeExpire(
         Scaffeine().maximumSize(maxCapacity),
@@ -96,7 +96,7 @@ object AsyncCache {
     ) = {
       val safeF = (_: Unit) => f.withTimeout(
         resultTimeout,
-        lila.common.LilaException(s"AsyncCache.single $name single timed out after $resultTimeout")
+        lila.base.LilaException(s"AsyncCache.single $name single timed out after $resultTimeout")
       )
       val cache: AsyncLoadingCache[Unit, V] = makeExpire(
         Scaffeine().maximumSize(1),
diff --git a/modules/memo/src/main/Syncache.scala b/modules/memo/src/main/Syncache.scala
index 0d029f1e763f..978f0459c63b 100644
--- a/modules/memo/src/main/Syncache.scala
+++ b/modules/memo/src/main/Syncache.scala
@@ -89,7 +89,7 @@ final class Syncache[K, V](
   private val loadFunction = new java.util.function.Function[K, Fu[V]] {
     def apply(k: K) = compute(k).withTimeout(
       duration = resultTimeout,
-      error = lila.common.LilaException(s"Syncache $name $k timed out after $resultTimeout")
+      error = lila.base.LilaException(s"Syncache $name $k timed out after $resultTimeout")
     )
       .chronometer.mon(_ => recComputeNanos).result // monitoring: record async time
       .addEffects(
diff --git a/modules/memo/src/main/package.scala b/modules/memo/src/main/package.scala
index dddb53d46a3b..2004546ac64e 100644
--- a/modules/memo/src/main/package.scala
+++ b/modules/memo/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object memo extends PackageObject with WithPlay {
+package object memo extends PackageObject {
 
   private[memo] def logger = lila.log("memo")
 }
diff --git a/modules/message/src/main/package.scala b/modules/message/src/main/package.scala
index 0af0e407ca1d..68015c97e961 100644
--- a/modules/message/src/main/package.scala
+++ b/modules/message/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object message extends PackageObject with WithPlay {
+package object message extends PackageObject {
 
   private[message] val logger = lila.log("message")
 }
diff --git a/modules/mod/src/main/package.scala b/modules/mod/src/main/package.scala
index fd7849d679ef..655e13734417 100644
--- a/modules/mod/src/main/package.scala
+++ b/modules/mod/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object mod extends PackageObject with WithPlay {
+package object mod extends PackageObject {
 
   private[mod] val logger = lila.log("mod")
 }
diff --git a/modules/notify/src/main/package.scala b/modules/notify/src/main/package.scala
index 7fd883696bb7..2c5b419f52c2 100644
--- a/modules/notify/src/main/package.scala
+++ b/modules/notify/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object notify extends PackageObject with WithPlay
\ No newline at end of file
+package object notify extends PackageObject
\ No newline at end of file
diff --git a/modules/perfStat/src/main/package.scala b/modules/perfStat/src/main/package.scala
index d93b206ef4df..c57cc3ddcf54 100644
--- a/modules/perfStat/src/main/package.scala
+++ b/modules/perfStat/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object perfStat extends PackageObject with WithPlay
+package object perfStat extends PackageObject
diff --git a/modules/plan/src/main/package.scala b/modules/plan/src/main/package.scala
index ef05104f8c37..b2514d420b5e 100644
--- a/modules/plan/src/main/package.scala
+++ b/modules/plan/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object plan extends PackageObject with WithPlay {
+package object plan extends PackageObject {
 
   private[plan] def logger = lila.log("plan")
 }
diff --git a/modules/playban/src/main/package.scala b/modules/playban/src/main/package.scala
index 292b2abc7ac0..47eaad4f9476 100644
--- a/modules/playban/src/main/package.scala
+++ b/modules/playban/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object playban extends PackageObject with WithPlay
+package object playban extends PackageObject
diff --git a/modules/pool/src/main/package.scala b/modules/pool/src/main/package.scala
index c57a9fc0b0d5..de9c192aba7f 100644
--- a/modules/pool/src/main/package.scala
+++ b/modules/pool/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object pool extends PackageObject with WithPlay {
+package object pool extends PackageObject {
 
   private[pool] val logger = lila.log("pool")
 }
diff --git a/modules/practice/src/main/Env.scala b/modules/practice/src/main/Env.scala
index a80827bcd1a0..f1843b2e75e0 100644
--- a/modules/practice/src/main/Env.scala
+++ b/modules/practice/src/main/Env.scala
@@ -4,8 +4,6 @@ import akka.actor._
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     configStore: lila.memo.ConfigStore.Builder,
diff --git a/modules/practice/src/main/package.scala b/modules/practice/src/main/package.scala
index 23aa54e5b39c..a1ea8f0733a7 100644
--- a/modules/practice/src/main/package.scala
+++ b/modules/practice/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object practice extends PackageObject with WithPlay {
+package object practice extends PackageObject {
 
   private[practice] val logger = lila.log("practice")
 }
diff --git a/modules/pref/src/main/Env.scala b/modules/pref/src/main/Env.scala
index 0dc904403956..5086d607d3ea 100644
--- a/modules/pref/src/main/Env.scala
+++ b/modules/pref/src/main/Env.scala
@@ -1,7 +1,6 @@
 package lila.pref
 
 import com.typesafe.config.Config
-import lila.common.PimpedConfig._
 
 final class Env(
     config: Config,
diff --git a/modules/pref/src/main/package.scala b/modules/pref/src/main/package.scala
index 0830ba1a17a4..9b6cf348543f 100644
--- a/modules/pref/src/main/package.scala
+++ b/modules/pref/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object pref extends PackageObject with WithPlay
+package object pref extends PackageObject
diff --git a/modules/push/src/main/package.scala b/modules/push/src/main/package.scala
index edbe7727d0a1..84c440a94cc9 100644
--- a/modules/push/src/main/package.scala
+++ b/modules/push/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object push extends PackageObject with WithPlay {
+package object push extends PackageObject {
 
   private[push] def logger = lila.log("push")
 }
diff --git a/modules/puzzle/src/main/Env.scala b/modules/puzzle/src/main/Env.scala
index 82a5f1a7dcc5..170ac7e2e090 100644
--- a/modules/puzzle/src/main/Env.scala
+++ b/modules/puzzle/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.puzzle
 import akka.actor.{ ActorSelection, ActorSystem }
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     renderer: ActorSelection,
diff --git a/modules/puzzle/src/main/package.scala b/modules/puzzle/src/main/package.scala
index 23ef17daa76f..858308570f9a 100644
--- a/modules/puzzle/src/main/package.scala
+++ b/modules/puzzle/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object puzzle extends PackageObject with WithPlay {
+package object puzzle extends PackageObject {
 
   type PuzzleId = Int
   type RoundId = Int
diff --git a/modules/qa/src/main/package.scala b/modules/qa/src/main/package.scala
index 7576092d0cb1..4dc5ed22aad1 100644
--- a/modules/qa/src/main/package.scala
+++ b/modules/qa/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object qa extends PackageObject with WithPlay {
+package object qa extends PackageObject {
 
   type Tag = String
   type QuestionId = Int
diff --git a/modules/relation/src/main/Env.scala b/modules/relation/src/main/Env.scala
index 2f079cb617cf..2c430e257202 100644
--- a/modules/relation/src/main/Env.scala
+++ b/modules/relation/src/main/Env.scala
@@ -4,8 +4,6 @@ import akka.actor._
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,
diff --git a/modules/relation/src/main/package.scala b/modules/relation/src/main/package.scala
index 87dbbb48abfb..466eaf78f7b9 100644
--- a/modules/relation/src/main/package.scala
+++ b/modules/relation/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object relation extends PackageObject with WithPlay {
+package object relation extends PackageObject {
 
   type Relation = Boolean
   val Follow: Relation = true
diff --git a/modules/relay/src/main/RelayFetch.scala b/modules/relay/src/main/RelayFetch.scala
index 2b05419c1f19..6974391b99c9 100644
--- a/modules/relay/src/main/RelayFetch.scala
+++ b/modules/relay/src/main/RelayFetch.scala
@@ -6,7 +6,7 @@ import play.api.libs.ws.{ WS, WSResponse }
 import play.api.Play.current
 import scala.concurrent.duration._
 
-import lila.common.LilaException
+import lila.base.LilaException
 
 private final class RelayFetch(
     sync: RelaySync,
diff --git a/modules/relay/src/main/RelaySync.scala b/modules/relay/src/main/RelaySync.scala
index 7cfe79cc0141..5175fba2eea4 100644
--- a/modules/relay/src/main/RelaySync.scala
+++ b/modules/relay/src/main/RelaySync.scala
@@ -3,7 +3,8 @@ package lila.relay
 import org.joda.time.DateTime
 
 import chess.format.pgn.{ Tag, Tags }
-import lila.common.{ LilaException, Chronometer }
+import lila.base.LilaException
+import lila.common.Chronometer
 import lila.socket.Socket.Uid
 import lila.study._
 
diff --git a/modules/relay/src/main/package.scala b/modules/relay/src/main/package.scala
index 9faf0256ed7d..718618bd6d9e 100644
--- a/modules/relay/src/main/package.scala
+++ b/modules/relay/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object relay extends PackageObject with WithPlay {
+package object relay extends PackageObject {
 
   private[relay] val logger = lila.log("relay")
 
diff --git a/modules/report/src/main/package.scala b/modules/report/src/main/package.scala
index 0625ee35565a..6beaa75654a8 100644
--- a/modules/report/src/main/package.scala
+++ b/modules/report/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object report extends PackageObject with WithPlay {
+package object report extends PackageObject {
 
   private[report] def logger = lila.log("report")
 }
diff --git a/modules/round/src/main/Env.scala b/modules/round/src/main/Env.scala
index 0e7c60a97eac..4ec15b961e9c 100644
--- a/modules/round/src/main/Env.scala
+++ b/modules/round/src/main/Env.scala
@@ -6,7 +6,7 @@ import com.typesafe.config.Config
 import scala.concurrent.duration._
 
 import actorApi.{ GetSocketStatus, SocketStatus }
-import lila.common.PimpedConfig._
+
 import lila.game.{ Game, Pov }
 import lila.hub.actorApi.HasUserId
 import lila.hub.actorApi.map.{ Ask, Tell }
diff --git a/modules/round/src/main/Forecast.scala b/modules/round/src/main/Forecast.scala
index 36a316cf36ce..b295ef46b8bc 100644
--- a/modules/round/src/main/Forecast.scala
+++ b/modules/round/src/main/Forecast.scala
@@ -56,7 +56,7 @@ object Forecast {
 
   implicit val forecastJsonWriter = Json.writes[Forecast]
 
-  case object OutOfSync extends lila.common.LilaException {
+  case object OutOfSync extends lila.base.LilaException {
     val message = "Forecast out of sync"
   }
 }
diff --git a/modules/round/src/main/package.scala b/modules/round/src/main/package.scala
index e1394dbca668..2b40600d0961 100644
--- a/modules/round/src/main/package.scala
+++ b/modules/round/src/main/package.scala
@@ -3,7 +3,7 @@ package lila
 import lila.game.Event
 import lila.socket.WithSocket
 
-package object round extends PackageObject with WithPlay with WithSocket {
+package object round extends PackageObject with WithSocket {
 
   private[round] type Events = List[Event]
 
@@ -14,7 +14,7 @@ package object round extends PackageObject with WithPlay with WithSocket {
 
 package round {
 
-  private[round] sealed trait BenignError extends lila.common.LilaException
+  private[round] sealed trait BenignError extends lila.base.LilaException
   private[round] case class ClientError(message: String) extends BenignError
   private[round] case class FishnetError(message: String) extends BenignError
 
diff --git a/modules/search/src/main/package.scala b/modules/search/src/main/package.scala
index ec868ce3756b..1bc918a34af0 100644
--- a/modules/search/src/main/package.scala
+++ b/modules/search/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object search extends PackageObject with WithPlay {
+package object search extends PackageObject {
 
   object Date {
     import org.joda.time.format.{ DateTimeFormat, DateTimeFormatter }
diff --git a/modules/security/src/main/Env.scala b/modules/security/src/main/Env.scala
index 89350e8cd09e..206af49e3e2c 100644
--- a/modules/security/src/main/Env.scala
+++ b/modules/security/src/main/Env.scala
@@ -3,8 +3,6 @@ package lila.security
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     captcher: akka.actor.ActorSelection,
diff --git a/modules/security/src/main/package.scala b/modules/security/src/main/package.scala
index 0d390f0d944c..dda65ea4b48a 100644
--- a/modules/security/src/main/package.scala
+++ b/modules/security/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object security extends PackageObject with WithPlay {
+package object security extends PackageObject {
 
   private[security] def logger = lila.log("security")
 }
diff --git a/modules/setup/src/main/Env.scala b/modules/setup/src/main/Env.scala
index 53bfe9fc336f..8b17c480976b 100644
--- a/modules/setup/src/main/Env.scala
+++ b/modules/setup/src/main/Env.scala
@@ -3,7 +3,6 @@ package lila.setup
 import akka.actor._
 import com.typesafe.config.{ Config => AppConfig }
 
-import lila.common.PimpedConfig._
 import lila.user.UserContext
 
 final class Env(
diff --git a/modules/setup/src/main/package.scala b/modules/setup/src/main/package.scala
index 5d9b72c58e54..2abb36fe6f2d 100644
--- a/modules/setup/src/main/package.scala
+++ b/modules/setup/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import lila.socket.WithSocket
 
-package object setup extends PackageObject with WithPlay with WithSocket {
+package object setup extends PackageObject with WithSocket {
 
   private[setup] def logger = lila.log("setup")
 }
diff --git a/modules/shutup/src/main/package.scala b/modules/shutup/src/main/package.scala
index 67a821148593..9271d1d09c78 100644
--- a/modules/shutup/src/main/package.scala
+++ b/modules/shutup/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object shutup extends PackageObject with WithPlay
+package object shutup extends PackageObject
diff --git a/modules/simul/src/main/Env.scala b/modules/simul/src/main/Env.scala
index 0f9fc1ed19b8..f83c59ca7fc3 100644
--- a/modules/simul/src/main/Env.scala
+++ b/modules/simul/src/main/Env.scala
@@ -5,7 +5,6 @@ import akka.pattern.ask
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
 import lila.hub.actorApi.map.Ask
 import lila.hub.{ ActorMap, Sequencer }
 import lila.socket.actorApi.GetVersion
diff --git a/modules/simul/src/main/package.scala b/modules/simul/src/main/package.scala
index cadaf2d4e7ab..4addbb9cc7e0 100644
--- a/modules/simul/src/main/package.scala
+++ b/modules/simul/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import lila.socket.WithSocket
 
-package object simul extends PackageObject with WithPlay with WithSocket {
+package object simul extends PackageObject with WithSocket {
 
   private[simul] object RandomName {
 
diff --git a/modules/site/src/main/Env.scala b/modules/site/src/main/Env.scala
index a0b8e9e7ec72..bfc30543ef9e 100644
--- a/modules/site/src/main/Env.scala
+++ b/modules/site/src/main/Env.scala
@@ -4,8 +4,6 @@ import akka.actor._
 import com.typesafe.config.Config
 import play.api.libs.concurrent.Akka.system
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     hub: lila.hub.Env,
diff --git a/modules/site/src/main/package.scala b/modules/site/src/main/package.scala
index e3c23316a581..5b0fd0593d82 100644
--- a/modules/site/src/main/package.scala
+++ b/modules/site/src/main/package.scala
@@ -2,4 +2,4 @@ package lila
 
 import lila.socket.WithSocket
 
-package object site extends PackageObject with WithPlay with WithSocket
+package object site extends PackageObject with WithSocket
diff --git a/modules/slack/src/main/package.scala b/modules/slack/src/main/package.scala
index 50c7b5f36f43..2be14070e058 100644
--- a/modules/slack/src/main/package.scala
+++ b/modules/slack/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object slack extends PackageObject with WithPlay
+package object slack extends PackageObject
diff --git a/modules/socket/src/main/package.scala b/modules/socket/src/main/package.scala
index 246ad7e6383d..a14c8e93267a 100644
--- a/modules/socket/src/main/package.scala
+++ b/modules/socket/src/main/package.scala
@@ -1,4 +1,4 @@
 package lila
 
 package object socket
-  extends PackageObject with WithPlay with socket.WithSocket
+  extends PackageObject with socket.WithSocket
diff --git a/modules/study/src/main/Env.scala b/modules/study/src/main/Env.scala
index 3f50e9464d28..f79f4f10a7f7 100644
--- a/modules/study/src/main/Env.scala
+++ b/modules/study/src/main/Env.scala
@@ -5,7 +5,6 @@ import akka.pattern.ask
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
 import lila.user.User
 import lila.hub.actorApi.map.Ask
 import lila.hub.{ ActorMap, Sequencer }
diff --git a/modules/study/src/main/package.scala b/modules/study/src/main/package.scala
index 699b172d6fd4..1872562eb2f9 100644
--- a/modules/study/src/main/package.scala
+++ b/modules/study/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import lila.socket.WithSocket
 
-package object study extends PackageObject with WithPlay with WithSocket {
+package object study extends PackageObject with WithSocket {
 
   private[study] val logger = lila.log("study")
 
diff --git a/modules/studySearch/src/main/package.scala b/modules/studySearch/src/main/package.scala
index 3da54bd784b8..59dd9ae5f562 100644
--- a/modules/studySearch/src/main/package.scala
+++ b/modules/studySearch/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object studySearch extends PackageObject with WithPlay {
+package object studySearch extends PackageObject {
 
   private[studySearch] val logger = lila.log("studySearch")
 }
diff --git a/modules/team/src/main/package.scala b/modules/team/src/main/package.scala
index 6d2b3c08918d..13ff3762a86e 100644
--- a/modules/team/src/main/package.scala
+++ b/modules/team/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object team extends PackageObject with WithPlay {
+package object team extends PackageObject {
 
   private[team] def logger = lila.log("team")
 }
diff --git a/modules/teamSearch/src/main/package.scala b/modules/teamSearch/src/main/package.scala
index 33edf94940ec..2d749f0f00c9 100644
--- a/modules/teamSearch/src/main/package.scala
+++ b/modules/teamSearch/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object teamSearch extends PackageObject with WithPlay {
+package object teamSearch extends PackageObject {
 
   private[teamSearch] val logger = lila.log("teamSearch")
 }
diff --git a/modules/timeline/src/main/package.scala b/modules/timeline/src/main/package.scala
index 8d05056ee049..89ae7f736e58 100644
--- a/modules/timeline/src/main/package.scala
+++ b/modules/timeline/src/main/package.scala
@@ -1,3 +1,3 @@
 package lila
 
-package object timeline extends PackageObject with WithPlay
+package object timeline extends PackageObject
diff --git a/modules/tournament/src/main/Env.scala b/modules/tournament/src/main/Env.scala
index 64e773056bf6..6fe0183887a8 100644
--- a/modules/tournament/src/main/Env.scala
+++ b/modules/tournament/src/main/Env.scala
@@ -5,7 +5,6 @@ import akka.pattern.ask
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
 import lila.hub.actorApi.map.Ask
 import lila.hub.{ ActorMap, Sequencer }
 import lila.socket.actorApi.GetVersion
diff --git a/modules/tournament/src/main/package.scala b/modules/tournament/src/main/package.scala
index 918ba9522a66..cf2861f5c754 100644
--- a/modules/tournament/src/main/package.scala
+++ b/modules/tournament/src/main/package.scala
@@ -2,7 +2,7 @@ package lila
 
 import lila.socket.WithSocket
 
-package object tournament extends PackageObject with WithPlay with WithSocket {
+package object tournament extends PackageObject with WithSocket {
 
   private[tournament] type Players = List[tournament.Player]
 
diff --git a/modules/tv/src/main/Env.scala b/modules/tv/src/main/Env.scala
index 6ebeae5c849c..7bfbb7b7a64d 100644
--- a/modules/tv/src/main/Env.scala
+++ b/modules/tv/src/main/Env.scala
@@ -3,7 +3,6 @@ package lila.tv
 import akka.actor._
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
 import lila.db.dsl._
 
 import scala.concurrent.duration._
diff --git a/modules/tv/src/main/package.scala b/modules/tv/src/main/package.scala
index 219f75e520c8..6f31f1d1189b 100644
--- a/modules/tv/src/main/package.scala
+++ b/modules/tv/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object tv extends PackageObject with WithPlay {
+package object tv extends PackageObject {
 
   private[tv] def logger = lila.log("tv")
 }
diff --git a/modules/user/src/main/Env.scala b/modules/user/src/main/Env.scala
index 70a876067502..a225689f5c4d 100644
--- a/modules/user/src/main/Env.scala
+++ b/modules/user/src/main/Env.scala
@@ -4,7 +4,6 @@ import akka.actor._
 import com.typesafe.config.Config
 
 import lila.common.EmailAddress
-import lila.common.PimpedConfig._
 
 final class Env(
     config: Config,
diff --git a/modules/user/src/main/package.scala b/modules/user/src/main/package.scala
index aead83eec84d..2df88e439d82 100644
--- a/modules/user/src/main/package.scala
+++ b/modules/user/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object user extends PackageObject with WithPlay {
+package object user extends PackageObject {
 
   private[user] def logger = lila.log("user")
 
diff --git a/modules/video/src/main/Env.scala b/modules/video/src/main/Env.scala
index 82d80635d175..6b8a01b4a564 100644
--- a/modules/video/src/main/Env.scala
+++ b/modules/video/src/main/Env.scala
@@ -2,8 +2,6 @@ package lila.video
 
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     scheduler: lila.common.Scheduler,
diff --git a/modules/video/src/main/package.scala b/modules/video/src/main/package.scala
index e0040a7b74e0..3358c74dd995 100644
--- a/modules/video/src/main/package.scala
+++ b/modules/video/src/main/package.scala
@@ -1,6 +1,6 @@
 package lila
 
-package object video extends PackageObject with WithPlay {
+package object video extends PackageObject {
 
   type Target = Int
   type Tag = String