diff --git a/cmd/agola/cmd/orgmemberlist.go b/cmd/agola/cmd/orgmemberlist.go
index f80ca8f..eded209 100644
--- a/cmd/agola/cmd/orgmemberlist.go
+++ b/cmd/agola/cmd/orgmemberlist.go
@@ -36,9 +36,7 @@ var cmdOrgMemberList = &cobra.Command{
 }
 
 type orgMemberListOptions struct {
-	orgname  string
-	username string
-	role     string
+	orgname string
 }
 
 var orgMemberListOpts orgMemberListOptions
diff --git a/cmd/agola/cmd/serve.go b/cmd/agola/cmd/serve.go
index 15e21e6..435a877 100644
--- a/cmd/agola/cmd/serve.go
+++ b/cmd/agola/cmd/serve.go
@@ -102,15 +102,12 @@ func embeddedEtcd(ctx context.Context) error {
 	}
 
 	go func() {
-		select {
-		case <-e.Server.ReadyNotify():
-			log.Infof("embedded etcd server is ready")
-		}
-		select {
-		case <-ctx.Done():
-			log.Infof("stopping embedded etcd server")
-			e.Close()
-		}
+		<-e.Server.ReadyNotify()
+		log.Infof("embedded etcd server is ready")
+
+		<-ctx.Done()
+		log.Infof("stopping embedded etcd server")
+		e.Close()
 	}()
 
 	return nil