diff --git a/.travis.yml b/.travis.yml
index a5a7a74..aa3fefb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,7 @@ env:
 script:
   - admin/build.sh
 scala:
-  - 2.10.4
-  - 2.11.5
+  - 2.11.6
 jdk:
   - oraclejdk8
 notifications:
diff --git a/README.md b/README.md
index ecf5887..2493c0c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## scala-java8-compat [<img src="https://api.travis-ci.org/scala/scala-java8-compat.png"/>](https://travis-ci.org/scala/scala-java8-compat) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.10.svg?label=latest%20release%20for%202.10"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.10) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11*.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11*)
+## scala-java8-compat [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-java8-compat_2.11*.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-java8-compat_2.11*)
 
 A Java 8 compatibility kit for Scala.
 
diff --git a/project/CodeGen.scala b/project/CodeGen.scala
index 0e0234c..1428e34 100644
--- a/project/CodeGen.scala
+++ b/project/CodeGen.scala
@@ -331,26 +331,9 @@ object CodeGen {
         |}
         |""".stripMargin.trim
     }
-    // andThen / compose variants are no longer needed under 2.11 (@unspecialized has been fixed),
-    // but harmless. With them, we can use the same artifact for 2.10 and 2.11
-    val compose = specialized("compose", function1Spec) {
-      case (name, List(t1, r1)) =>
-        s"""
-        |default scala.Function1 $name(scala.Function1 g) {
-        |    return compose(g);
-        |}""".stripMargin.trim
-    }
-    val andThen = specialized("andThen", function1Spec) {
-      case (name, List(t1, r1)) =>
-        s"""
-        |default scala.Function1 $name(scala.Function1 g) {
-        |    return andThen(g);
-        |}""".stripMargin.trim
-    }
-    indent(List(apply, compose, andThen).mkString("\n\n"))
+    indent(List(apply).mkString("\n\n"))
   }
 
-  // No longer needed under 2.11 (@unspecialized has been fixed), but harmless to keep around to avoid cross-publishing this artifact.
   private def function2SpecMethods = {
     val apply = specialized("apply", function2Spec) {
       case (name, List(t1, t2, r)) =>
@@ -363,21 +346,7 @@ object CodeGen {
         |}
         |""".stripMargin.trim
     }
-    val curried = specialized("curried", function2Spec) {
-      case (name, List(t1, t2, r)) =>
-        s"""
-        |default scala.Function1 $name() {
-        |    return curried();
-        |}""".stripMargin.trim
-    }
-    val tupled = specialized("tupled", function2Spec) {
-      case (name, List(t1, t2, r)) =>
-        s"""
-        |default scala.Function1 $name() {
-        |    return tupled();
-        |}""".stripMargin.trim
-    }
-    indent(List(apply, curried, tupled).mkString("\n\n"))
+    indent(List(apply).mkString("\n\n"))
   }
 
   def specializedSuffix(tparamNames: List[String], tps: List[Type]): String = {