diff --git a/main.go b/main.go
index d9725f572..d176ed44c 100755
--- a/main.go
+++ b/main.go
@@ -195,7 +195,7 @@ func main() {
 
 			socketHandler := wsHandler().ServeHTTP
 
-			extraOriginStr := "https://create.arduino.cc, http://create.arduino.cc, https://create-dev.arduino.cc, http://create-dev.arduino.cc, http://create-staging.arduino.cc, https://create-staging.arduino.cc"
+			extraOriginStr := "https://create.arduino.cc, http://create.arduino.cc, https://create-dev.arduino.cc, http://create-dev.arduino.cc"
 
 			for i := 8990; i < 9001; i++ {
 				extraOriginStr = extraOriginStr + ", http://localhost:" + strconv.Itoa(i) + ", https://localhost:" + strconv.Itoa(i)
diff --git a/trayicon.go b/trayicon.go
index 4be9c61f7..104361154 100644
--- a/trayicon.go
+++ b/trayicon.go
@@ -31,12 +31,13 @@
 package main
 
 import (
+	"runtime"
+
 	log "github.com/Sirupsen/logrus"
 	"github.com/facchinm/go-serial"
 	"github.com/facchinm/systray"
 	"github.com/facchinm/systray/example/icon"
 	"github.com/skratchdot/open-golang/open"
-	"runtime"
 )
 
 func setupSysTray() {
@@ -63,7 +64,7 @@ func addRebootTrayElement() {
 func setupSysTrayReal() {
 
 	systray.SetIcon(icon.Data)
-	mUrl := systray.AddMenuItem("Go to Arduino Create (staging)", "Arduino Create")
+	mUrl := systray.AddMenuItem("Go to Arduino Create", "Arduino Create")
 	mDebug := systray.AddMenuItem("Open debug console", "Debug console")
 	menuVer := systray.AddMenuItem("Agent version "+version+"-"+git_revision, "")
 	mPause := systray.AddMenuItem("Pause Plugin", "")
@@ -101,7 +102,7 @@ func setupSysTrayReal() {
 	go func() {
 		for {
 			<-mUrl.ClickedCh
-			open.Start("http://create-staging.arduino.cc")
+			open.Start("http://create.arduino.cc")
 		}
 	}()
 }