diff --git a/control/plugin/collector_proxy_test.go b/control/plugin/collector_proxy_test.go
index ec4c5e363..b4830fd8f 100644
--- a/control/plugin/collector_proxy_test.go
+++ b/control/plugin/collector_proxy_test.go
@@ -23,8 +23,6 @@ package plugin
 
 import (
 	"errors"
-	"log"
-	"os"
 	"testing"
 	"time"
 
diff --git a/control/plugin/session.go b/control/plugin/session.go
index a888d7b81..11a7d61c3 100644
--- a/control/plugin/session.go
+++ b/control/plugin/session.go
@@ -313,9 +313,8 @@ func init() {
 // simpleFormatter is a logrus formatter that includes only the message.
 type simpleFormatter struct{}
 
-func (_ *simpleFormatter) Format(entry *log.Entry) ([]byte, error) {
+func (*simpleFormatter) Format(entry *log.Entry) ([]byte, error) {
 	b := &bytes.Buffer{}
-	fmt.Fprintf(b, "%s", entry.Message)
-	b.WriteByte('\n')
+	fmt.Fprintf(b, "%s\n", entry.Message)
 	return b.Bytes(), nil
 }
diff --git a/scheduler/workflow.go b/scheduler/workflow.go
index 9e2a48b9d..76e537350 100644
--- a/scheduler/workflow.go
+++ b/scheduler/workflow.go
@@ -21,7 +21,6 @@ package scheduler
 
 import (
 	"errors"
-	"fmt"
 	"sync"
 
 	log "github.com/Sirupsen/logrus"