diff --git a/dm/dm.go b/dm/dm.go
index 9b77a55d404930d37af44e64eb4ea62d95f9df9a..1fa9da57861a2943350f8fb9b1fd46eca0ba5ead 100644
--- a/dm/dm.go
+++ b/dm/dm.go
@@ -295,11 +295,7 @@ func getDownloadURLs(tName string) []string {
 	if err := json.Unmarshal([]byte(resp), &u); err != nil {
 		panic(fmt.Errorf("Failed to parse JSON response from service: %s", resp))
 	}
-	urls := []string{}
-	for _, url := range u {
-		urls = append(urls, url)
-	}
-	return urls
+	return u
 }
 
 func loadTemplate(args []string) *common.Template {
diff --git a/manager/deployments.go b/manager/deployments.go
index 42ee00a223fff3c670547887a1fcdea2d5f1b9d0..ff6accb6cb19961d16bb30661c59024f905e1513 100644
--- a/manager/deployments.go
+++ b/manager/deployments.go
@@ -80,6 +80,9 @@ func init() {
 	routes = append(routes, deployments...)
 	var credentialProvider common.CredentialProvider
 	if *credentialFile != "" {
+		if *credentialSecrets {
+			panic(fmt.Errorf("Both credentialFile and credentialSecrets are set"))
+		}
 		var err error
 		credentialProvider, err = registry.NewFilebasedCredentialProvider(*credentialFile)
 		if err != nil {
@@ -427,7 +430,7 @@ func getDownloadURLsHandlerFunc(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var urls = []string{}
+	urls := []string{}
 	for _, u := range c {
 		urls = append(urls, u.String())
 	}
diff --git a/registry/github_package_registry.go b/registry/github_package_registry.go
index 5d91147ef0e70e7e3370fac22e08d3db967cda69..7f457021b0d71ea53928229beac905f55e35da92 100644
--- a/registry/github_package_registry.go
+++ b/registry/github_package_registry.go
@@ -124,10 +124,6 @@ func (g GithubPackageRegistry) GetDownloadURLs(t Type) ([]*url.URL, error) {
 			}
 		}
 	}
-
-	for _, ll := range downloadURLs {
-		log.Printf("Found DOWNLOAD URL AS: %#v", ll.String())
-	}
 	return downloadURLs, nil
 }