diff --git a/Makefile-UBUNTU b/Makefile-UBUNTU
index 657aa8f0..c4a8f103 100644
--- a/Makefile-UBUNTU
+++ b/Makefile-UBUNTU
@@ -254,7 +254,7 @@ build-advancedserver-cover: docker-version
 
 .PHONY: build-explorer 
 build-explorer: downloads/$(MQ_ARCHIVE_DEV) docker-pull
-	$(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
+	$(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
 
 .PHONY: build-sdk
 build-sdk: downloads/$(MQ_SDK_ARCHIVE) build-sdk-ex
diff --git a/internal/containerruntime/runtime.go b/internal/containerruntime/runtime.go
index 3b42b093..49c53d12 100644
--- a/internal/containerruntime/runtime.go
+++ b/internal/containerruntime/runtime.go
@@ -72,17 +72,6 @@ func GetSecurityAttributes() string {
 	return a
 }
 
-// func logUser() {
-// 	u, err := user.GetUser()
-// 	if err == nil {
-// 		if len(u.SupplementalGID) == 0 {
-// 			log.Printf("Running as user ID %v (%v) with primary group %v", u.UID, u.Name, u.PrimaryGID)
-// 		} else {
-// 			log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.UID, u.Name, u.PrimaryGID, strings.Join(u.SupplementalGID, ","))
-// 		}
-// 	}
-// }
-
 func readProc(filename string) (value string, err error) {
 	// #nosec G304
 	buf, err := ioutil.ReadFile(filename)
diff --git a/internal/containerruntime/runtime_linux.go b/internal/containerruntime/runtime_linux.go
index 3c92fbb5..94c99c3b 100644
--- a/internal/containerruntime/runtime_linux.go
+++ b/internal/containerruntime/runtime_linux.go
@@ -110,7 +110,6 @@ func GetFilesystem(path string) (string, error) {
 	t, ok := fsTypes[int64(statfs.Type)]
 	if !ok {
 		return "unknown", nil
-		// log.Printf("WARNING: detected %v has unknown filesystem type %x", path, statfs.Type)
 	}
 	return t, nil
 }
diff --git a/internal/user/user.go b/internal/user/user.go
index 08ffb2f5..2a61aaf6 100644
--- a/internal/user/user.go
+++ b/internal/user/user.go
@@ -73,7 +73,6 @@ func getCurrentUserGroups() ([]string, error) {
 
 	out = strings.TrimSpace(out)
 	if out == "" {
-		// we don't have any groups?
 		return nilArray, fmt.Errorf("Unable to determine groups for current user")
 	}
 
diff --git a/test/docker/docker_api_test_util.go b/test/docker/docker_api_test_util.go
index 104511ee..2aa1500d 100644
--- a/test/docker/docker_api_test_util.go
+++ b/test/docker/docker_api_test_util.go
@@ -241,7 +241,6 @@ func runContainerWithPorts(t *testing.T, cli *client.Client, containerConfig *co
 	hostConfig := container.HostConfig{
 		Binds: []string{
 			coverageBind(t),
-			// terminationBind(t),
 		},
 		PortBindings: nat.PortMap{},
 		CapDrop: []string{