diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
index ed05ac80e..b758206ef 100644
--- a/cmd/telegraf/telegraf.go
+++ b/cmd/telegraf/telegraf.go
@@ -48,7 +48,9 @@ func main() {
 			log.Fatal(err)
 		}
 	} else {
-		config = telegraf.DefaultConfig()
+		fmt.Println("Usage: Telegraf")
+		flag.PrintDefaults()
+		return
 	}
 
 	ag, err := telegraf.NewAgent(config)
@@ -65,7 +67,7 @@ func main() {
 		log.Fatal(err)
 	}
 	if len(outputs) == 0 {
-		log.Printf("Error: no ouputs found, did you provide a config file?")
+		log.Printf("Error: no outputs found, did you provide a valid config file?")
 		os.Exit(1)
 	}
 
@@ -74,7 +76,7 @@ func main() {
 		log.Fatal(err)
 	}
 	if len(plugins) == 0 {
-		log.Printf("Error: no plugins found, did you provide a config file?")
+		log.Printf("Error: no plugins found, did you provide a valid config file?")
 		os.Exit(1)
 	}
 
diff --git a/config.go b/config.go
index de756f917..3ba9d4a49 100644
--- a/config.go
+++ b/config.go
@@ -253,11 +253,6 @@ func declared(endpoints map[string]*ast.Table) []string {
 	return names
 }
 
-// DefaultConfig returns an empty default configuration
-func DefaultConfig() *Config {
-	return &Config{}
-}
-
 var errInvalidConfig = errors.New("invalid configuration")
 
 // LoadConfig loads the given config file and returns a *Config pointer