diff --git a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala
index 615751a7f9..635086959c 100644
--- a/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala
+++ b/bitcoind-rpc/src/main/scala/org/bitcoins/rpc/config/BitcoindInstance.scala
@@ -9,12 +9,6 @@ import org.bitcoins.core.util.BitcoinSLogger
 import org.bitcoins.rpc.client.common.BitcoindVersion
 
 import scala.sys.process._
-import org.bitcoins.core.util.BitcoinSLogger
-import org.bitcoins.core.config.NetworkParameters
-
-import scala.util.Properties
-import java.nio.file.Files
-
 import scala.util.Properties
 
 /**
diff --git a/chain/src/main/scala/org/bitcoins/chain/db/ChainDbManagement.scala b/chain/src/main/scala/org/bitcoins/chain/db/ChainDbManagement.scala
index 6f5b5edb41..32ece7f984 100644
--- a/chain/src/main/scala/org/bitcoins/chain/db/ChainDbManagement.scala
+++ b/chain/src/main/scala/org/bitcoins/chain/db/ChainDbManagement.scala
@@ -1,17 +1,11 @@
 package org.bitcoins.chain.db
 
-import org.bitcoins.db._
-import org.bitcoins.chain.models.{
-  BlockHeaderTable,
-  CompactFilterHeaderTable,
-  CompactFilterTable
-}
+import org.bitcoins.chain.config.ChainAppConfig
+import org.bitcoins.chain.models.{BlockHeaderTable, CompactFilterHeaderTable, CompactFilterTable}
 import org.bitcoins.db.DbManagement
 import slick.lifted.TableQuery
 
-import scala.concurrent.Future
-import scala.concurrent.ExecutionContext
-import org.bitcoins.chain.config.ChainAppConfig
+import scala.concurrent.{ExecutionContext, Future}
 
 /**
   * Responsible for creating and destroying database
diff --git a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPingMessageSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPingMessageSerializer.scala
index bcf4cb13ed..eac080eeda 100644
--- a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPingMessageSerializer.scala
+++ b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPingMessageSerializer.scala
@@ -1,9 +1,8 @@
 package org.bitcoins.core.serializers.p2p.messages
 
 import org.bitcoins.core.number.UInt64
+import org.bitcoins.core.p2p.PingMessage
 import org.bitcoins.core.serializers.RawBitcoinSerializer
-import org.bitcoins.core.p2p.PingMessage
-import org.bitcoins.core.p2p.PingMessage
 import scodec.bits.ByteVector
 
 /**
diff --git a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPongMessageSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPongMessageSerializer.scala
index 0616acb931..d69376d0d8 100644
--- a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPongMessageSerializer.scala
+++ b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawPongMessageSerializer.scala
@@ -1,9 +1,8 @@
 package org.bitcoins.core.serializers.p2p.messages
 
 import org.bitcoins.core.number.UInt64
+import org.bitcoins.core.p2p.PongMessage
 import org.bitcoins.core.serializers.RawBitcoinSerializer
-import org.bitcoins.core.p2p.PongMessage
-import org.bitcoins.core.p2p.PongMessage
 import scodec.bits.ByteVector
 
 trait RawPongMessageSerializer extends RawBitcoinSerializer[PongMessage] {
diff --git a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawRejectMessageSerializer.scala b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawRejectMessageSerializer.scala
index a93bf30b7c..4e8d41e181 100644
--- a/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawRejectMessageSerializer.scala
+++ b/core/src/main/scala/org/bitcoins/core/serializers/p2p/messages/RawRejectMessageSerializer.scala
@@ -1,9 +1,8 @@
 package org.bitcoins.core.serializers.p2p.messages
 
+import org.bitcoins.core.p2p.RejectMessage
 import org.bitcoins.core.protocol.CompactSizeUInt
 import org.bitcoins.core.serializers.RawBitcoinSerializer
-import org.bitcoins.core.p2p.RejectMessage
-import org.bitcoins.core.p2p.RejectMessage
 import scodec.bits.ByteVector
 
 trait RawRejectMessageSerializer extends RawBitcoinSerializer[RejectMessage] {
diff --git a/inThisBuild.sbt b/inThisBuild.sbt
index 1f712b2a6c..d991be1253 100644
--- a/inThisBuild.sbt
+++ b/inThisBuild.sbt
@@ -1,6 +1,6 @@
 val scala2_11 = "2.11.12"
 val scala2_12 = "2.12.11"
-val scala2_13 = "2.13.1"
+val scala2_13 = "2.13.2"
 
 scalaVersion in ThisBuild := scala2_13
 
diff --git a/project/CommonSettings.scala b/project/CommonSettings.scala
index ff39b0912c..4623676168 100644
--- a/project/CommonSettings.scala
+++ b/project/CommonSettings.scala
@@ -67,7 +67,7 @@ object CommonSettings {
 
   private val commonCompilerOpts = {
     List(
-      "-Xsource:2.12",
+      "-Xsource:2.13",
       "-target:jvm-1.8"
     )
   }
diff --git a/testkit/src/main/scala/org/bitcoins/testkit/core/gen/p2p/ControlMessageGenerator.scala b/testkit/src/main/scala/org/bitcoins/testkit/core/gen/p2p/ControlMessageGenerator.scala
index a62992d29d..e0fe36529b 100644
--- a/testkit/src/main/scala/org/bitcoins/testkit/core/gen/p2p/ControlMessageGenerator.scala
+++ b/testkit/src/main/scala/org/bitcoins/testkit/core/gen/p2p/ControlMessageGenerator.scala
@@ -3,22 +3,12 @@ package org.bitcoins.testkit.core.gen.p2p
 import java.net.{InetAddress, InetSocketAddress}
 
 import org.bitcoins.core.number.{UInt32, UInt64}
-import org.bitcoins.core.p2p.ProtocolVersion
+import org.bitcoins.core.p2p.{ProtocolVersion, _}
 import org.bitcoins.core.protocol.CompactSizeUInt
-import org.bitcoins.core.p2p._
-import org.bitcoins.core.p2p._
-import org.bitcoins.testkit.core.gen.{
-  BloomFilterGenerator,
-  CryptoGenerators,
-  NumberGenerator,
-  StringGenerators
-}
+import org.bitcoins.core.wallet.fee.{SatoshisPerByte, SatoshisPerKiloByte, SatoshisPerVirtualByte}
+import org.bitcoins.testkit.core.gen._
 import org.scalacheck.Gen
 import scodec.bits.ByteVector
-import org.bitcoins.testkit.core.gen.CurrencyUnitGenerator
-import org.bitcoins.core.wallet.fee.SatoshisPerByte
-import org.bitcoins.core.wallet.fee.SatoshisPerKiloByte
-import org.bitcoins.core.wallet.fee.SatoshisPerVirtualByte
 
 object ControlMessageGenerator {