diff --git a/java/com/google/gerrit/extensions/restapi/RestApiModule.java b/java/com/google/gerrit/extensions/restapi/RestApiModule.java
index 783df0b..e65e6e5 100644
--- a/java/com/google/gerrit/extensions/restapi/RestApiModule.java
+++ b/java/com/google/gerrit/extensions/restapi/RestApiModule.java
@@ -31,24 +31,23 @@
   protected static final String CREATE = "CREATE";
 
   protected <R extends RestResource> ReadViewBinder<R> get(TypeLiteral<RestView<R>> viewType) {
-    return new ReadViewBinder<>(view(viewType, GET, "/"));
+    return get(viewType, "/");
   }
 
   protected <R extends RestResource> ModifyViewBinder<R> put(TypeLiteral<RestView<R>> viewType) {
-    return new ModifyViewBinder<>(view(viewType, PUT, "/"));
+    return put(viewType, "/");
   }
 
   protected <R extends RestResource> ModifyViewBinder<R> post(TypeLiteral<RestView<R>> viewType) {
-    return new ModifyViewBinder<>(view(viewType, POST, "/"));
+    return post(viewType, "/");
   }
 
   protected <R extends RestResource> ModifyViewBinder<R> delete(TypeLiteral<RestView<R>> viewType) {
-    return new ModifyViewBinder<>(view(viewType, DELETE, "/"));
+    return delete(viewType, "/");
   }
 
-  protected <P extends RestResource, R extends RestResource> CreateViewBinder<R> create(
-      TypeLiteral<RestView<R>> viewType) {
-    return new CreateViewBinder<>(createView(viewType, CREATE, "/"));
+  protected <R extends RestResource> CreateViewBinder<R> create(TypeLiteral<RestView<R>> viewType) {
+    return new CreateViewBinder<>(bind(viewType).annotatedWith(export(CREATE, "/")));
   }
 
   protected <R extends RestResource> ReadViewBinder<R> get(
@@ -81,12 +80,6 @@
     return bind(viewType).annotatedWith(export(method, name));
   }
 
-  protected <P extends RestResource, R extends RestResource>
-      LinkedBindingBuilder<RestView<R>> createView(
-          TypeLiteral<RestView<R>> viewType, String method, String name) {
-    return bind(viewType).annotatedWith(export(method, name));
-  }
-
   private static Export export(String method, String name) {
     if (name.length() > 1 && name.startsWith("/")) {
       // Views may be bound as "/" to mean the resource itself, or
