diff --git a/src/main/scala/net/psforever/actors/net/LoginActor.scala b/src/main/scala/net/psforever/actors/net/LoginActor.scala
index 3656316b..6fd5d7bd 100644
--- a/src/main/scala/net/psforever/actors/net/LoginActor.scala
+++ b/src/main/scala/net/psforever/actors/net/LoginActor.scala
@@ -45,7 +45,6 @@ class LoginActor(
 class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], connectionId: String, sessionId: Long)
     extends Actor
     with MDCContextAware {
-  private[this] val log = org.log4s.getLogger
 
   import scala.concurrent.ExecutionContext.Implicits.global
 
@@ -100,9 +99,9 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
         val clientVersion = s"Client Version: $majorVersion.$minorVersion.$revision, $buildDate"
 
         if (token.isDefined)
-          log.trace(s"New login UN:$username Token:${token.get}. $clientVersion")
+          log.debug(s"New login UN:$username Token:${token.get}. $clientVersion")
         else {
-          log.trace(s"New login UN:$username. $clientVersion")
+          log.debug(s"New login UN:$username. $clientVersion")
         }
 
         accountLogin(username, password.getOrElse(""))
@@ -114,7 +113,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
         middlewareActor ! MiddlewareActor.Close()
 
       case _ =>
-        log.warn(s"Unhandled GamePacket $pkt")
+        log.warning(s"Unhandled GamePacket $pkt")
     }
 
   def accountLogin(username: String, password: String): Unit = {
@@ -196,7 +195,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
   }
 
   def loginPwdFailureResponse(username: String, newToken: String) = {
-    log.warn(s"Failed login to account $username")
+    log.warning(s"Failed login to account $username")
     middlewareActor ! MiddlewareActor.Send(
       LoginRespMessage(
         newToken,
@@ -211,7 +210,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
   }
 
   def loginFailureResponse(username: String, newToken: String) = {
-    log.warn("DB problem")
+    log.warning("DB problem")
     middlewareActor ! MiddlewareActor.Send(
       LoginRespMessage(
         newToken,
@@ -226,7 +225,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
   }
 
   def loginAccountFailureResponse(username: String, newToken: String) = {
-    log.warn(s"Account $username inactive")
+    log.warning(s"Account $username inactive")
     middlewareActor ! MiddlewareActor.Send(
       LoginRespMessage(
         newToken,
diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala
index 82e2d2d8..c8350c7a 100644
--- a/src/main/scala/net/psforever/actors/session/SessionActor.scala
+++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala
@@ -102,7 +102,10 @@ object SessionActor {
       tickTime: Long = 250L
   )
 
-  private[session] final case class AvatarAwardMessageBundle(bundle: Iterable[Iterable[PlanetSideGamePacket]], delay: Long)
+  private[session] final case class AvatarAwardMessageBundle(
+      bundle: Iterable[Iterable[PlanetSideGamePacket]],
+      delay: Long
+  )
 }
 
 class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], connectionId: String, sessionId: Long)
@@ -110,9 +113,8 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
     with MDCContextAware {
   MDC("connectionId") = connectionId
 
-  private[this] val log = org.log4s.getLogger
   private[this] val buffer: mutable.ListBuffer[Any] = new mutable.ListBuffer[Any]()
-  private[this] val sessionFuncs = new SessionData(middlewareActor, context)
+  private[this] val sessionFuncs                    = new SessionData(middlewareActor, context)
 
   override val supervisorStrategy: SupervisorStrategy = sessionFuncs.sessionSupervisorStrategy
 
@@ -195,7 +197,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
       sessionFuncs.zoning.spawn.handlePlayerLoaded(tplayer)
 
     case Zone.Population.PlayerHasLeft(zone, None) =>
-      log.trace(s"PlayerHasLeft: ${sessionFuncs.player.Name} does not have a body on ${zone.id}")
+      log.debug(s"PlayerHasLeft: ${sessionFuncs.player.Name} does not have a body on ${zone.id}")
 
     case Zone.Population.PlayerHasLeft(zone, Some(tplayer)) =>
       if (tplayer.isAlive) {
@@ -203,16 +205,20 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
       }
 
     case Zone.Population.PlayerCanNotSpawn(zone, tplayer) =>
-      log.warn(s"${tplayer.Name} can not spawn in zone ${zone.id}; why?")
+      log.warning(s"${tplayer.Name} can not spawn in zone ${zone.id}; why?")
 
     case Zone.Population.PlayerAlreadySpawned(zone, tplayer) =>
-      log.warn(s"${tplayer.Name} is already spawned on zone ${zone.id}; is this a clerical error?")
+      log.warning(s"${tplayer.Name} is already spawned on zone ${zone.id}; is this a clerical error?")
 
     case Zone.Vehicle.CanNotSpawn(zone, vehicle, reason) =>
-      log.warn(s"${sessionFuncs.player.Name}'s ${vehicle.Definition.Name} can not spawn in ${zone.id} because $reason")
+      log.warning(
+        s"${sessionFuncs.player.Name}'s ${vehicle.Definition.Name} can not spawn in ${zone.id} because $reason"
+      )
 
     case Zone.Vehicle.CanNotDespawn(zone, vehicle, reason) =>
-      log.warn(s"${sessionFuncs.player.Name}'s ${vehicle.Definition.Name} can not deconstruct in ${zone.id} because $reason")
+      log.warning(
+        s"${sessionFuncs.player.Name}'s ${vehicle.Definition.Name} can not deconstruct in ${zone.id} because $reason"
+      )
 
     case ICS.ZoneResponse(Some(zone)) =>
       sessionFuncs.zoning.handleZoneResponse(zone)
@@ -349,7 +355,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
       log.debug(s"CanNotPutItemInSlot: $msg")
 
     case default =>
-      log.warn(s"Invalid packet class received: $default from ${sender()}")
+      log.warning(s"Invalid packet class received: $default from ${sender()}")
   }
 
   private def handleGamePkt: PlanetSideGamePacket => Unit = {
@@ -363,7 +369,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
       sessionFuncs.vehicles.handleDismountVehicleCargo(packet)
 
     case packet: CharacterCreateRequestMessage =>
-     sessionFuncs.handleCharacterCreateRequest(packet)
+      sessionFuncs.handleCharacterCreateRequest(packet)
 
     case packet: CharacterRequestMessage =>
       sessionFuncs.handleCharacterRequest(packet)
@@ -588,6 +594,6 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
       sessionFuncs.handleHitHint(packet)
 
     case pkt =>
-      log.warn(s"Unhandled GamePacket $pkt")
+      log.warning(s"Unhandled GamePacket $pkt")
   }
 }