diff --git a/database/cert.go b/database/cert.go
index 784bd32..2d4aefd 100644
--- a/database/cert.go
+++ b/database/cert.go
@@ -15,8 +15,8 @@ const (
 
 // CachedCert is an individual cached certificate in the database.
 type CachedCert struct {
-	Key         string      `gorethink:"id" storm:"id"`
-	CryptoLevel CryptoLevel `gorethink:"cryptoLevel"`
+	Key         string `storm:"id"`
+	CryptoLevel CryptoLevel
 	// PEM-encoded bytes with the above crypto level as a filter.
-	Body []byte `gorethink:"body"`
+	Body []byte
 }
diff --git a/database/route.go b/database/route.go
index 9510b71..9150a13 100644
--- a/database/route.go
+++ b/database/route.go
@@ -7,11 +7,9 @@ import (
 
 // Route is a single HTTP route.
 type Route struct {
-	ID       string `gorethink:"id,omitempty" storm:"id"`
+	ID       string `storm:"id"`
 	Creator  string
-	Hostname string `gorethink:"hostname" storm:"index"`
-
-	Token string `gorethink:"token" storm:"-"` // deprecated
+	Hostname string `storm:"index"`
 }
 
 // F https://godoc.org/github.com/Xe/ln#F