diff --git a/main.go b/main.go
index 369cda4..44b1bd1 100644
--- a/main.go
+++ b/main.go
@@ -1,12 +1,12 @@
 package main
 
 import (
-	"code.google.com/p/go-uuid/uuid"
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"github.com/pborman/uuid"
 	"github.com/golang/groupcache/lru"
 	"github.com/namsral/flag"
 	"log"
@@ -79,12 +79,6 @@ func main() {
 	log.Fatal(server.ListenAndServe())
 }
 
-func envOrFlag(name, help string) string {
-	flag.String(name, "", help)
-
-	return ""
-}
-
 func redirectIfCookieMissing(handler http.Handler, ssoSecret, cookieSecret, ssoUri, proxyHost string) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		cookie, err := r.Cookie("__discourse_proxy")