diff --git a/merkle/iavl_test.go b/merkle/iavl_test.go
index dd7897e86..00002fa7f 100644
--- a/merkle/iavl_test.go
+++ b/merkle/iavl_test.go
@@ -12,10 +12,6 @@ import (
 	"testing"
 )
 
-func init() {
-	// TODO: seed rand?
-}
-
 func randstr(length int) string {
 	return RandStr(length)
 }
diff --git a/rpc/http_server.go b/rpc/http_server.go
index 63a761093..47770f3d8 100644
--- a/rpc/http_server.go
+++ b/rpc/http_server.go
@@ -48,19 +48,10 @@ func RecoverAndLogHandler(handler http.Handler) http.Handler {
 		begin := time.Now()
 
 		// Common headers
-		rww.Header().Set("Access-Control-Allow-Origin", "*")
-		/*
-			origin := r.Header.Get("Origin")
-			originUrl, err := url.Parse(origin)
-			if err == nil {
-				originHost := strings.Split(originUrl.Host, ":")[0]
-				if strings.HasSuffix(originHost, ".tendermint.com") {
-					rww.Header().Set("Access-Control-Allow-Origin", origin)
-					rww.Header().Set("Access-Control-Allow-Credentials", "true")
-					rww.Header().Set("Access-Control-Expose-Headers", "X-Server-Time")
-				}
-			}
-		*/
+		origin := r.Header.Get("Origin")
+		rww.Header().Set("Access-Control-Allow-Origin", origin)
+		rww.Header().Set("Access-Control-Allow-Credentials", "true")
+		rww.Header().Set("Access-Control-Expose-Headers", "X-Server-Time")
 		rww.Header().Set("X-Server-Time", fmt.Sprintf("%v", begin.Unix()))
 
 		defer func() {