9 files changed, 6 insertions, 36 deletions
diff --git a/lib/scala-compiler-src.jar.desired.sha1 b/lib/scala-compiler-src.jar.desired.sha1
index 69fa09546d..082d86ff67 100644
--- a/lib/scala-compiler-src.jar.desired.sha1
+++ b/lib/scala-compiler-src.jar.desired.sha1
@@ -1 +1 @@
-44deab4311f4717a416e76d0c54190d6a0f2c968 ?scala-compiler-src.jar
+cfa3ee21f76cd5c115bd3bc070a3b401587bafb5 ?scala-compiler-src.jar
diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index a247e24f0a..bb39b4d6a6 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-bccf8d18a168d4997fec62ac4097c22b1fb8c031 ?scala-compiler.jar
+d54b99f215d4d42b3f0b3489fbb1081270700992 ?scala-compiler.jar
diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1
index 865aa13106..cd42c23291 100644
--- a/lib/scala-library-src.jar.desired.sha1
+++ b/lib/scala-library-src.jar.desired.sha1
@@ -1 +1 @@
-ea2ce62024b691f35a6d0083f27fd8a8c399f72d ?scala-library-src.jar
+8bdac1cdd60b73ff7e12fd2b556355fa10343e2d ?scala-library-src.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 450eabecd9..6bdeaa903b 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-7960dae9ef6471b412c904b12e54d06e35fc30cd ?scala-library.jar
+1e0e39fae15b42e85998740511ec5a3830e26243 ?scala-library.jar
diff --git a/lib/scala-reflect-src.jar.desired.sha1 b/lib/scala-reflect-src.jar.desired.sha1
index 3e67b926ee..d630c938f2 100644
--- a/lib/scala-reflect-src.jar.desired.sha1
+++ b/lib/scala-reflect-src.jar.desired.sha1
@@ -1 +1 @@
-60799c7cf8ee80b0e05e1209d5970a714d32bd76 ?scala-reflect-src.jar
+d229f4c91ea8ab1a81559b5803efd9b0b1632f0b ?scala-reflect-src.jar
diff --git a/lib/scala-reflect.jar.desired.sha1 b/lib/scala-reflect.jar.desired.sha1
index eaa998f79a..a5d6701749 100644
--- a/lib/scala-reflect.jar.desired.sha1
+++ b/lib/scala-reflect.jar.desired.sha1
@@ -1 +1 @@
-619eb8ffe5b62268107580f8baa38e140a734620 ?scala-reflect.jar
+288f47dbe1002653e030fd25ca500b9ffe1ebd64 ?scala-reflect.jar
diff --git a/src/library/scala/reflect/base/compat.scala b/src/library/scala/reflect/base/compat.scala
deleted file mode 100644
index 0f7bec49f2..0000000000
--- a/src/library/scala/reflect/base/compat.scala
+++ /dev/null
@@ -1,16 +0,0 @@
-package scala.reflect.base
-
-// should be removed once I re-deploy the starr
-trait Exprs {
-  case class Expr
-}
-trait TypeTags {
-  case class TypeTag
-  case class WeakTypeTag
-}
-trait Universe {
-  def reify: Nothing = ???
-}
-trait MirrorOf
-trait TypeCreator
-trait TreeCreator
-\ No newline at end of file
diff --git a/src/library/scala/reflect/macros/internal/package.scala b/src/library/scala/reflect/macros/internal/package.scala
deleted file mode 100644
index 61efc58e04..0000000000
--- a/src/library/scala/reflect/macros/internal/package.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package scala.reflect.macros
-
-import scala.reflect.base.{Universe => BaseUniverse}
-import scala.reflect.ClassTag
-
-package object internal {
-  // should all be removed once I re-deploy the starr
-  def materializeClassTag[T](u: BaseUniverse): ClassTag[T] = ???
-  def materializeWeakTypeTag: Nothing = ???
-  def materializeTypeTag: Nothing = ???
-}
diff --git a/src/library/scala/reflect/package.scala b/src/library/scala/reflect/package.scala
index f9ad743ab3..4f1cc03dc8 100644
--- a/src/library/scala/reflect/package.scala
+++ b/src/library/scala/reflect/package.scala
@@ -2,9 +2,6 @@ package scala
 
 package object reflect {
 
-  // should be removed once I re-deploy the starr
-  val basis: scala.reflect.base.Universe = null
-
   // in the new scheme of things ClassManifests are aliased to ClassTags
   // this is done because we want `toArray` in collections work with ClassTags
   // but changing it to use the ClassTag context bound without aliasing ClassManifest