10 files changed, 7 insertions, 318 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala
index 0db55344..9149447a 100644
--- a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala
@@ -348,16 +348,6 @@ trait VecLike[T <: Data] extends collection.IndexedSeq[T] with HasId with Source
   override def hashCode: Int = super[HasId].hashCode
   override def equals(that: Any): Boolean = super[HasId].equals(that)
 
-  @chiselRuntimeDeprecated
-  @deprecated("Use Vec.apply instead", "chisel3")
-  def read(idx: UInt)(implicit compileOptions: CompileOptions): T = do_apply(idx)(compileOptions)
-
-  @chiselRuntimeDeprecated
-  @deprecated("Use Vec.apply instead", "chisel3")
-  def write(idx: UInt, data: T)(implicit compileOptions: CompileOptions): Unit = {
-    do_apply(idx)(compileOptions).:=(data)(DeprecatedSourceInfo, compileOptions)
-  }
-
   /** Outputs true if p outputs true for every element.
     */
   def forall(p: T => Bool): Bool = macro SourceInfoTransform.pArg
diff --git a/chiselFrontend/src/main/scala/chisel3/Annotation.scala b/chiselFrontend/src/main/scala/chisel3/Annotation.scala
index 506ec282..08119f44 100644
--- a/chiselFrontend/src/main/scala/chisel3/Annotation.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Annotation.scala
@@ -18,17 +18,6 @@ trait ChiselAnnotation {
   /** Conversion to FIRRTL Annotation */
   def toFirrtl: Annotation
 }
-object ChiselAnnotation {
-  @deprecated("Write a custom ChiselAnnotation subclass instead", "3.1")
-  def apply(component: InstanceId, transformClass: Class[_ <: Transform], value: String): ChiselLegacyAnnotation =
-    ChiselLegacyAnnotation(component, transformClass, value)
-  @deprecated("Write a custom ChiselAnnotation subclass instead", "3.1")
-  def unapply(anno: ChiselAnnotation): Option[(InstanceId, Class[_ <: Transform], String)] =
-    anno match {
-      case ChiselLegacyAnnotation(c, t, v) => Some(c, t, v)
-      case _ => None
-    }
-}
 
 /** Mixin for [[ChiselAnnotation]] that instantiates an associated FIRRTL Transform when this Annotation is present
   * during a run of
diff --git a/chiselFrontend/src/main/scala/chisel3/Bits.scala b/chiselFrontend/src/main/scala/chisel3/Bits.scala
index 7462708c..804c1a2e 100644
--- a/chiselFrontend/src/main/scala/chisel3/Bits.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Bits.scala
@@ -404,28 +404,6 @@ sealed abstract class Bits(private[chisel3] val width: Width) extends Element wi
     throwException(s"Cannot call .asFixedPoint on $this")
   }
 
-  /** Reinterpret cast to Bits. */
-  @chiselRuntimeDeprecated
-  @deprecated("Use asUInt, which does the same thing but returns a more concrete type", "chisel3")
-  final def asBits(implicit compileOptions: CompileOptions): Bits = {
-    implicit val sourceInfo = DeprecatedSourceInfo
-    do_asUInt
-  }
-
-  @chiselRuntimeDeprecated
-  @deprecated("Use asSInt, which makes the reinterpret cast more explicit", "chisel3")
-  final def toSInt(implicit compileOptions: CompileOptions): SInt = {
-    implicit val sourceInfo = DeprecatedSourceInfo
-    do_asSInt
-  }
-
-  @chiselRuntimeDeprecated
-  @deprecated("Use asUInt, which makes the reinterpret cast more explicit", "chisel3")
-  final def toUInt(implicit compileOptions: CompileOptions): UInt = {
-    implicit val sourceInfo = DeprecatedSourceInfo
-    do_asUInt
-  }
-
   final def do_asBool(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = {
     width match {
       case KnownWidth(1) => this(0)
@@ -830,7 +808,7 @@ sealed class UInt private[chisel3] (width: Width) extends Bits(width) with Num[U
   override def do_>= (that: UInt)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = compop(sourceInfo, GreaterEqOp, that)
 
   @chiselRuntimeDeprecated
-  @deprecated("Use '=/=', which avoids potential precedence problems", "chisel3")
+  @deprecated("Use '=/=', which avoids potential precedence problems", "3.0")
   final def != (that: UInt)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = this =/= that
 
   /** Dynamic not equals operator
@@ -1120,7 +1098,7 @@ sealed class SInt private[chisel3] (width: Width) extends Bits(width) with Num[S
   override def do_>= (that: SInt)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = compop(sourceInfo, GreaterEqOp, that)
 
   @chiselRuntimeDeprecated
-  @deprecated("Use '=/=', which avoids potential precedence problems", "chisel3")
+  @deprecated("Use '=/=', which avoids potential precedence problems", "3.0")
   final def != (that: SInt)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): Bool = this =/= that
 
   /** Dynamic not equals operator
@@ -1652,11 +1630,6 @@ package experimental {
     def apply(): FixedPoint = apply(Width(), BinaryPoint())
 
     /** Create an FixedPoint type or port with fixed width. */
-    @chiselRuntimeDeprecated
-    @deprecated("Use FixedPoint(width: Width, binaryPoint: BinaryPoint) example FixedPoint(16.W, 8.BP)", "chisel3")
-    def apply(width: Int, binaryPoint: Int): FixedPoint = apply(Width(width), BinaryPoint(binaryPoint))
-
-    /** Create an FixedPoint type or port with fixed width. */
     def apply(width: Width, binaryPoint: BinaryPoint): FixedPoint = new FixedPoint(width, binaryPoint)
 
     /** Create an FixedPoint literal with inferred width from BigInt.
@@ -1684,17 +1657,6 @@ package experimental {
     /** Create an FixedPoint literal with inferred width from Double.
       * Use PrivateObject to force users to specify width and binaryPoint by name
       */
-    @chiselRuntimeDeprecated
-    @deprecated("use fromDouble(value: Double, width: Width, binaryPoint: BinaryPoint)", "chisel3")
-    def fromDouble(value: Double, dummy: PrivateType = PrivateObject,
-                   width: Int = -1, binaryPoint: Int = 0): FixedPoint = {
-      fromBigInt(
-        toBigInt(value, binaryPoint), width = width, binaryPoint = binaryPoint
-      )
-    }
-    /** Create an FixedPoint literal with inferred width from Double.
-      * Use PrivateObject to force users to specify width and binaryPoint by name
-      */
     def fromDouble(value: Double, width: Width, binaryPoint: BinaryPoint): FixedPoint = {
       fromBigInt(
         toBigInt(value, binaryPoint.get), width = width, binaryPoint = binaryPoint
@@ -1737,9 +1699,6 @@ package experimental {
 
   //      implicit class fromDoubleToLiteral(val double: Double) extends AnyVal {
       implicit class fromDoubleToLiteral(double: Double) {
-        @deprecated("Use notation <double>.F(<binary_point>.BP) instead", "chisel3")
-        def F(binaryPoint: Int): FixedPoint = FixedPoint.fromDouble(double, binaryPoint = binaryPoint)
-
         def F(binaryPoint: BinaryPoint): FixedPoint = {
           FixedPoint.fromDouble(double, Width(), binaryPoint)
         }
diff --git a/chiselFrontend/src/main/scala/chisel3/Data.scala b/chiselFrontend/src/main/scala/chisel3/Data.scala
index 62424ab2..37c9622f 100644
--- a/chiselFrontend/src/main/scala/chisel3/Data.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Data.scala
@@ -110,12 +110,6 @@ object ActualDirection {
   }
 }
 
-object debug {  // scalastyle:ignore object.name
-  @chiselRuntimeDeprecated
-  @deprecated("debug doesn't do anything in Chisel3 as no pruning happens in the frontend", "chisel3")
-  def apply (arg: Data): Data = arg
-}
-
 package experimental {
 
   /** Experimental hardware construction reflection API
@@ -522,14 +516,6 @@ abstract class Data extends HasId with NamedComponent with SourceInfoDoc { // sc
   /** Returns Some(width) if the width is known, else None. */
   final def widthOption: Option[Int] = if (isWidthKnown) Some(getWidth) else None
 
-  /** Packs the value of this object as plain Bits.
-    *
-    * This performs the inverse operation of fromBits(Bits).
-    */
-  @chiselRuntimeDeprecated
-  @deprecated("Best alternative, .asUInt()", "chisel3")
-  def toBits(implicit compileOptions: CompileOptions): UInt = do_asUInt(DeprecatedSourceInfo, compileOptions)
-
   /** Does a reinterpret cast of the bits in this node into the format that provides.
     * Returns a new Wire of that type. Does not modify existing nodes.
     *
@@ -610,23 +596,7 @@ trait WireFactory {
   * }}}
   *
   */
-object Wire extends WireFactory {
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(init=init) is deprecated, use WireDefault(init) instead", "chisel3")
-  def apply[T <: Data](dummy: Int = 0, init: T)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(init)
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(t, init) is deprecated, use WireDefault(t, init) instead", "chisel3")
-  def apply[T <: Data](t: T, init: T)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(t, init)
-
-  @chiselRuntimeDeprecated
-  @deprecated("Wire(t, init) is deprecated, use WireDefault(t, init) instead", "chisel3")
-  def apply[T <: Data](t: T, init: DontCare.type)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T =
-    WireDefault(t, init)
-}
+object Wire extends WireFactory
 
 /** Utility for constructing hardware wires with a default connection
   *
diff --git a/chiselFrontend/src/main/scala/chisel3/Mem.scala b/chiselFrontend/src/main/scala/chisel3/Mem.scala
index c64c0e35..26c4a0b0 100644
--- a/chiselFrontend/src/main/scala/chisel3/Mem.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Mem.scala
@@ -10,15 +10,6 @@ import chisel3.internal.firrtl._
 import chisel3.internal.sourceinfo.{SourceInfo, SourceInfoTransform, UnlocatableSourceInfo, MemTransform}
 
 object Mem {
-  // scalastyle:off line.size.limit
-  @chiselRuntimeDeprecated
-  @deprecated("Mem argument order should be size, t; this will be removed by the official release", "chisel3")
-  def apply[T <: Data](t: T, size: BigInt)(implicit compileOptions: CompileOptions): Mem[T] = do_apply(size, t)(UnlocatableSourceInfo, compileOptions)
-
-  // scalastyle:off line.size.limit
-  @chiselRuntimeDeprecated
-  @deprecated("Mem argument order should be size, t; this will be removed by the official release", "chisel3")
-  def apply[T <: Data](t: T, size: Int)(implicit compileOptions: CompileOptions): Mem[T] = do_apply(size, t)(UnlocatableSourceInfo, compileOptions)
 
   /** Creates a combinational/asynchronous-read, sequential/synchronous-write [[Mem]].
     *
@@ -150,13 +141,6 @@ sealed abstract class MemBase[T <: Data](t: T, val length: BigInt) extends HasId
 sealed class Mem[T <: Data] private (t: T, length: BigInt) extends MemBase(t, length)
 
 object SyncReadMem {
-  @chiselRuntimeDeprecated
-  @deprecated("SeqMem/SyncReadMem argument order should be size, t; this will be removed by the official release", "chisel3")
-  def apply[T <: Data](t: T, size: BigInt)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): SyncReadMem[T] = do_apply(size, t)
-
-  @chiselRuntimeDeprecated
-  @deprecated("SeqMem/SyncReadMem argument order should be size, t; this will be removed by the official release", "chisel3")
-  def apply[T <: Data](t: T, size: Int)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): SyncReadMem[T] = do_apply(size, t)
 
   /** Creates a sequential/synchronous-read, sequential/synchronous-write [[SyncReadMem]].
     *
diff --git a/chiselFrontend/src/main/scala/chisel3/Module.scala b/chiselFrontend/src/main/scala/chisel3/Module.scala
index 8a11b0a6..c8527f34 100644
--- a/chiselFrontend/src/main/scala/chisel3/Module.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Module.scala
@@ -285,14 +285,6 @@ package experimental {
       */
     def _compatAutoWrapPorts() {} // scalastyle:ignore method.name
 
-    //
-    // BaseModule User API functions
-    //
-    @deprecated("Use chisel3.experimental.annotate instead", "3.1")
-    protected def annotate(annotation: ChiselAnnotation): Unit = {
-      Builder.annotations += annotation
-    }
-
     /** Chisel2 code didn't require the IO(...) wrapper and would assign a Chisel type directly to
       * io, then do operations on it. This binds a Chisel type in-place (mutably) as an IO.
       */
diff --git a/chiselFrontend/src/main/scala/chisel3/RawModule.scala b/chiselFrontend/src/main/scala/chisel3/RawModule.scala
index 14a7a584..6d316074 100644
--- a/chiselFrontend/src/main/scala/chisel3/RawModule.scala
+++ b/chiselFrontend/src/main/scala/chisel3/RawModule.scala
@@ -171,29 +171,6 @@ abstract class LegacyModule(implicit moduleCompileOptions: CompileOptions)
   protected var override_clock: Option[Clock] = None
   protected var override_reset: Option[Bool] = None
 
-  // _clock and _reset can be clock and reset in these 2ary constructors
-  // once chisel2 compatibility issues are resolved
-  @chiselRuntimeDeprecated
-  @deprecated("Module constructor with override_clock and override_reset deprecated, use withClockAndReset", "chisel3")
-  def this(override_clock: Option[Clock]=None, override_reset: Option[Bool]=None)
-      (implicit moduleCompileOptions: CompileOptions) = {
-    this()
-    this.override_clock = override_clock
-    this.override_reset = override_reset
-  }
-
-  @chiselRuntimeDeprecated
-  @deprecated("Module constructor with override _clock deprecated, use withClock", "chisel3")
-  def this(_clock: Clock)(implicit moduleCompileOptions: CompileOptions) = this(Option(_clock), None)(moduleCompileOptions) // scalastyle:ignore line.size.limit
-
-  @chiselRuntimeDeprecated
-  @deprecated("Module constructor with override _reset deprecated, use withReset", "chisel3")
-  def this(_reset: Bool)(implicit moduleCompileOptions: CompileOptions)  = this(None, Option(_reset))(moduleCompileOptions) // scalastyle:ignore line.size.limit
-
-  @chiselRuntimeDeprecated
-  @deprecated("Module constructor with override _clock, _reset deprecated, use withClockAndReset", "chisel3")
-  def this(_clock: Clock, _reset: Bool)(implicit moduleCompileOptions: CompileOptions) = this(Option(_clock), Option(_reset))(moduleCompileOptions) // scalastyle:ignore line.size.limit
-
   // IO for this Module. At the Scala level (pre-FIRRTL transformations),
   // connections in and out of a Module may only go through `io` elements.
   def io: Record
diff --git a/chiselFrontend/src/main/scala/chisel3/Reg.scala b/chiselFrontend/src/main/scala/chisel3/Reg.scala
index 2f26f516..8d3a915d 100644
--- a/chiselFrontend/src/main/scala/chisel3/Reg.scala
+++ b/chiselFrontend/src/main/scala/chisel3/Reg.scala
@@ -46,32 +46,6 @@ object Reg {
     reg
   }
 
-  @chiselRuntimeDeprecated
-  @deprecated("Use Reg(t), RegNext(next, [init]) or RegInit([t], init) instead", "chisel3")
-  def apply[T <: Data](t: T = null, next: T = null, init: T = null)
-                      (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T = {
-    if (t ne null) {
-      val reg = if (init ne null) {
-        RegInit(t, init)
-      } else {
-        Reg(t)
-      }
-      if (next ne null) {
-        reg := next
-      }
-      reg
-    } else if (next ne null) {
-      if (init ne null) {
-        RegNext(next, init)
-      } else {
-        RegNext(next)
-      }
-    } else if (init ne null) {
-      RegInit(init)
-    } else {
-      throwException("cannot infer type")
-    }
-  }
 }
 
 object RegNext {
diff --git a/chiselFrontend/src/main/scala/chisel3/core/package.scala b/chiselFrontend/src/main/scala/chisel3/core/package.scala
index 27c34950..13a89971 100644
--- a/chiselFrontend/src/main/scala/chisel3/core/package.scala
+++ b/chiselFrontend/src/main/scala/chisel3/core/package.scala
@@ -234,10 +234,6 @@ package object core {
   implicit class fromIntToBinaryPoint(int: Int) extends experimental.FixedPoint.Implicits.fromIntToBinaryPoint(int)
 
   @deprecated("Use the version in chisel3.experimental._", "3.2")
-  type ChiselAnnotation = chisel3.experimental.ChiselAnnotation
-  @deprecated("Use the version in chisel3.experimental._", "3.2")
-  val ChiselAnnotation = chisel3.experimental.ChiselAnnotation
-  @deprecated("Use the version in chisel3.experimental._", "3.2")
   type RunFirrtlTransform = chisel3.experimental.RunFirrtlTransform
 
   @deprecated("Use the version in chisel3.experimental._", "3.2")
diff --git a/chiselFrontend/src/main/scala/chisel3/package.scala b/chiselFrontend/src/main/scala/chisel3/package.scala
index 16d10ff7..dee07297 100644
--- a/chiselFrontend/src/main/scala/chisel3/package.scala
+++ b/chiselFrontend/src/main/scala/chisel3/package.scala
@@ -116,70 +116,7 @@ package object chisel3 {    // scalastyle:ignore package.object.name
 
   val WireInit = WireDefault
 
-  implicit class AddDirectionToData[T<:Data](target: T) {
-    @chiselRuntimeDeprecated
-    @deprecated("Input(Data) should be used over Data.asInput", "chisel3")
-    def asInput(implicit compileOptions: CompileOptions): T = Input(target)
-
-    @chiselRuntimeDeprecated
-    @deprecated("Output(Data) should be used over Data.asOutput", "chisel3")
-    def asOutput(implicit compileOptions: CompileOptions): T = Output(target)
-
-    @chiselRuntimeDeprecated
-    @deprecated("Flipped(Data) should be used over Data.flip", "chisel3")
-    def flip()(implicit compileOptions: CompileOptions): T = Flipped(target)
-  }
-
-  implicit class fromBitsable[T <: Data](data: T) {
-
-    @chiselRuntimeDeprecated
-    @deprecated("fromBits is deprecated, use asTypeOf instead", "chisel3")
-    def fromBits(that: Bits)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): T = {
-      that.asTypeOf(data)
-    }
-  }
-
-  implicit class cloneTypeable[T <: Data](target: T) {
-    @chiselRuntimeDeprecated
-    @deprecated("chiselCloneType is deprecated, use chiselTypeOf(...) to get the Chisel Type of a hardware object", "chisel3") // scalastyle:ignore line.size.limit
-    def chiselCloneType: T = {
-      target.cloneTypeFull.asInstanceOf[T]
-    }
-  }
-
-  object Vec extends VecFactory {
-    import scala.language.experimental.macros
-
-    @chiselRuntimeDeprecated
-    @deprecated("Vec argument order should be size, t; this will be removed by the official release", "chisel3")
-    def apply[T <: Data](gen: T, n: Int)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): chisel3.Vec[T] =
-      apply(n, gen)
-
-    @chiselRuntimeDeprecated
-    @deprecated("Vec.fill(n)(gen) is deprecated, use VecInit(Seq.fill(n)(gen)) instead", "chisel3")
-    def fill[T <: Data](n: Int)(gen: => T)(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): chisel3.Vec[T] =
-      apply(Seq.fill(n)(gen))
-
-    def apply[T <: Data](elts: Seq[T]): chisel3.Vec[T] = macro VecTransform.apply_elts
-    @chiselRuntimeDeprecated
-    @deprecated("Vec(elts) is deprecated, use VecInit(elts) instead", "chisel3")
-    def do_apply[T <: Data](elts: Seq[T])(implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): chisel3.Vec[T] =
-      chisel3.VecInit(elts)
-
-    def apply[T <: Data](elt0: T, elts: T*): chisel3.Vec[T] = macro VecTransform.apply_elt0
-    @chiselRuntimeDeprecated
-    @deprecated("Vec(elt0, ...) is deprecated, use VecInit(elt0, ...) instead", "chisel3")
-    def do_apply[T <: Data](elt0: T, elts: T*)
-        (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): chisel3.Vec[T] =
-      VecInit(elt0 +: elts.toSeq)
-
-    def tabulate[T <: Data](n: Int)(gen: (Int) => T): chisel3.Vec[T] = macro VecTransform.tabulate
-    @chiselRuntimeDeprecated
-    @deprecated("Vec.tabulate(n)(gen) is deprecated, use VecInit.tabulate(n)(gen) instead", "chisel3")
-    def do_tabulate[T <: Data](n: Int)(gen: (Int) => T)
-        (implicit sourceInfo: SourceInfo, compileOptions: CompileOptions): chisel3.Vec[T] =
-      chisel3.VecInit.tabulate(n)(gen)
-  }
+  object Vec extends VecFactory
 
   // Some possible regex replacements for the literal specifier deprecation:
   // (note: these are not guaranteed to handle all edge cases! check all replacements!)
@@ -201,91 +138,17 @@ package object chisel3 {    // scalastyle:ignore package.object.name
   /** This contains literal constructor factory methods that are deprecated as of Chisel3.
     * These will be removed very soon. It's recommended you port your code ASAP.
     */
-  trait UIntFactory extends UIntFactoryBase {
-    /** Create a UInt literal with inferred width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use n.U", "chisel3, will be removed by end of 2017")
-    def apply(n: String): UInt = n.asUInt
-
-    /** Create a UInt literal with fixed width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use n.U(width.W)", "chisel3, will be removed by end of 2017")
-    def apply(n: String, width: Int): UInt = n.asUInt(width.W)
-
-    /** Create a UInt literal with specified width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.U(width)", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt, width: Width): UInt = value.asUInt(width)
-
-    /** Create a UInt literal with fixed width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.U(width.W)", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt, width: Int): UInt = value.asUInt(width.W)
-
-    /** Create a UInt literal with inferred width.- compatibility with Chisel2. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.U", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt): UInt = value.asUInt
-
-    /** Create a UInt with a specified width */
-    @chiselRuntimeDeprecated
-    @deprecated("use UInt(width.W)", "chisel3, will be removed by end of 2017")
-    def width(width: Int): UInt = apply(width.W)
-
-    /** Create a UInt port with specified width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use UInt(width)", "chisel3, will be removed by end of 2017")
-    def width(width: Width): UInt = apply(width)
-  }
+  trait UIntFactory extends UIntFactoryBase
 
   /** This contains literal constructor factory methods that are deprecated as of Chisel3.
     * These will be removed very soon. It's recommended you move your code soon.
     */
-  trait SIntFactory extends SIntFactoryBase {
-    /** Create a SInt type or port with fixed width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use SInt(width.W)", "chisel3, will be removed by end of 2017")
-    def width(width: Int): SInt = apply(width.W)
-
-    /** Create an SInt type with specified width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use SInt(width)", "chisel3, will be removed by end of 2017")
-    def width(width: Width): SInt = apply(width)
-
-    /** Create an SInt literal with inferred width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.S", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt): SInt = value.asSInt
-
-    /** Create an SInt literal with fixed width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.S(width.W)", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt, width: Int): SInt = value.asSInt(width.W)
-
-    /** Create an SInt literal with specified width. */
-    @chiselRuntimeDeprecated
-    @deprecated("use value.S(width)", "chisel3, will be removed by end of 2017")
-    def apply(value: BigInt, width: Width): SInt = value.asSInt(width)
-
-    @chiselRuntimeDeprecated
-    @deprecated("use value.S", "chisel3, will be removed by end of 2017")
-    def Lit(value: BigInt): SInt = value.asSInt // scalastyle:ignore method.name
-
-    @chiselRuntimeDeprecated
-    @deprecated("use value.S(width)", "chisel3, will be removed by end of 2017")
-    def Lit(value: BigInt, width: Int): SInt = value.asSInt(width.W) // scalastyle:ignore method.name
-  }
+  trait SIntFactory extends SIntFactoryBase
 
   /** This contains literal constructor factory methods that are deprecated as of Chisel3.
     * These will be removed very soon. It's recommended you move your code soon.
     */
-  trait BoolFactory extends BoolFactoryBase {
-    /** Creates Bool literal.
-     */
-    @chiselRuntimeDeprecated
-    @deprecated("use x.B", "chisel3, will be removed by end of 2017")
-    def apply(x: Boolean): Bool = x.B
-  }
+  trait BoolFactory extends BoolFactoryBase
 
   object Bits extends UIntFactory
   object UInt extends UIntFactory
@@ -294,11 +157,6 @@ package object chisel3 {    // scalastyle:ignore package.object.name
 
   type InstanceId = internal.InstanceId
 
-  @deprecated("Use 'SyncReadMem'", "chisel3")
-  val SeqMem = chisel3.SyncReadMem
-  @deprecated("Use 'SyncReadMem'", "chisel3")
-  type SeqMem[T <: Data] = SyncReadMem[T]
-
   type Module = chisel3.experimental.LegacyModule
 
   /** Implicit for custom Printable string interpolator */