diff --git a/buildenv/envs.go b/buildenv/envs.go
index 7199b2f..a55a2ac 100644
--- a/buildenv/envs.go
+++ b/buildenv/envs.go
@@ -101,12 +101,6 @@
 	// PerfDataURL is the base URL of the benchmark storage server.
 	PerfDataURL string
 
-	// CoordinatorURL is the location from which the coordinator
-	// binary will be downloaded.
-	// This is only used by cmd/coordinator/buildongce/create.go when
-	// creating the coordinator VM from scratch.
-	CoordinatorURL string
-
 	// CoordinatorName is the hostname of the coordinator instance.
 	CoordinatorName string
 
@@ -247,7 +241,6 @@
 	},
 	DashURL:         "https://go-dashboard-dev.appspot.com/",
 	PerfDataURL:     "https://perfdata.golang.org",
-	CoordinatorURL:  "https://storage.googleapis.com/dev-go-builder-data/coordinator",
 	CoordinatorName: "farmer",
 	BuildletBucket:  "dev-go-builder-data",
 	LogBucket:       "dev-go-build-log",
@@ -279,7 +272,6 @@
 	},
 	DashURL:             "https://build.golang.org/",
 	PerfDataURL:         "https://perfdata.golang.org",
-	CoordinatorURL:      "https://storage.googleapis.com/go-builder-data/coordinator",
 	CoordinatorName:     "farmer",
 	BuildletBucket:      "go-builder-data",
 	LogBucket:           "go-build-log",
diff --git a/cmd/coordinator/.gitignore b/cmd/coordinator/.gitignore
index 91d0fb0..b76dea6 100644
--- a/cmd/coordinator/.gitignore
+++ b/cmd/coordinator/.gitignore
@@ -1,3 +1 @@
-buildongce/client-*.dat
-buildongce/token.dat
 coordinator
diff --git a/cmd/coordinator/buildongce/README.md b/cmd/coordinator/buildongce/README.md
deleted file mode 100644
index 436be4f..0000000
--- a/cmd/coordinator/buildongce/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Auto-generated by x/build/update-readmes.go -->
-
-[![GoDoc](https://godoc.org/golang.org/x/build/cmd/coordinator/buildongce?status.svg)](https://godoc.org/golang.org/x/build/cmd/coordinator/buildongce)
-
-# golang.org/x/build/cmd/coordinator/buildongce
-
-
diff --git a/cmd/gcpinit/README.md b/cmd/gcpinit/README.md
new file mode 100644
index 0000000..f5d884f
--- /dev/null
+++ b/cmd/gcpinit/README.md
@@ -0,0 +1,4 @@
+# golang.org/x/build/cmd/gcpinit
+
+The `gcpinit` command is a bootstrapping tool to create resources on
+GCP needed by the Go build system.
diff --git a/cmd/coordinator/buildongce/create.go b/cmd/gcpinit/gcpinit.go
similarity index 97%
rename from cmd/coordinator/buildongce/create.go
rename to cmd/gcpinit/gcpinit.go
index c9a1ff8..1bfbc1e 100644
--- a/cmd/coordinator/buildongce/create.go
+++ b/cmd/gcpinit/gcpinit.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main // import "golang.org/x/build/cmd/coordinator/buildongce"
+package main // import "golang.org/x/build/cmd/gcpinit"
 
 import (
 	"bytes"
diff --git a/cmd/coordinator/buildongce/create_test.go b/cmd/gcpinit/gcpinit_test.go
similarity index 94%
rename from cmd/coordinator/buildongce/create_test.go
rename to cmd/gcpinit/gcpinit_test.go
index 0c3c7d8..c75c647 100644
--- a/cmd/coordinator/buildongce/create_test.go
+++ b/cmd/gcpinit/gcpinit_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package main // import "golang.org/x/build/cmd/coordinator/buildongce"
+package main // import "golang.org/x/build/cmd/gcpinit"
 
 import (
 	"bytes"