diff --git a/config.go b/config.go
index 0a769aa15c77f7db5a2bdabdb8bc21188be0f7f4..c98d4361ea301bcd93aca54f740f203366d82903 100644
--- a/config.go
+++ b/config.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"log"
 	"os"
 	"path"
 	"time"
@@ -42,13 +41,10 @@ func parseConfig() (*systrayConfig, error) {
 }
 
 func (c *systrayConfig) hasDonated() bool {
-	log.Println("has donated ", c.Donated.Add(oneMonth))
 	return c.Donated.Add(oneMonth).After(time.Now())
 }
 
 func (c *systrayConfig) needsNotification() bool {
-	log.Println("needs ", c.LastNotification.Add(oneDay))
-	log.Println(!c.hasDonated() && c.LastNotification.Add(oneDay).Before(time.Now()))
 	return !c.hasDonated() && c.LastNotification.Add(oneDay).Before(time.Now())
 }
 
diff --git a/systray.go b/systray.go
index 4344748ef1ba59bc8a81e45ae328a5aab333f266..b160c035cfda8b1acbf10139ef1648e22cb81577 100644
--- a/systray.go
+++ b/systray.go
@@ -145,15 +145,10 @@ func (bt *bmTray) addGateways() {
 	}
 
 	systray.AddSeparator()
-
-	go bt.gatewaySelection()
-}
-
-func (bt *bmTray) gatewaySelection() {
-
 }
 
 func (bt *bmTray) changeStatus(status string) {
+	// TODO: ugly hacks with 'go' to hide/show
 	statusStr := status
 	bt.mTurnOn.SetTitle("Turn on")
 	if bt.waitCh != nil {