diff --git a/command/deployment_status.go b/command/deployment_status.go
index c42f63d5195..da144d84274 100644
--- a/command/deployment_status.go
+++ b/command/deployment_status.go
@@ -187,7 +187,6 @@ func (c *DeploymentStatusCommand) Run(args []string) int {
 			formatTime(time.Now()), limit(deploy.ID, length)))
 		c.monitor(client, deploy.ID, meta.LastIndex, wait, verbose)
 
-		// Hint here
 		hint, _ := c.Meta.showUIPath(UIHintContext{
 			Command: "deployment status",
 			PathParams: map[string]string{
diff --git a/command/job_run.go b/command/job_run.go
index 1caaef0581e..e83fe6c2155 100644
--- a/command/job_run.go
+++ b/command/job_run.go
@@ -404,7 +404,6 @@ func (c *JobRunCommand) Run(args []string) int {
 	}
 
 	// Detach was not specified, so start monitoring
-	// Set hint to open the browser
 	hint, _ := c.Meta.showUIPath(UIHintContext{
 		Command: "job run",
 		PathParams: map[string]string{
diff --git a/helper/pluginutils/catalog/register.go b/helper/pluginutils/catalog/register.go
index e583a049b66..a44f998fde8 100644
--- a/helper/pluginutils/catalog/register.go
+++ b/helper/pluginutils/catalog/register.go
@@ -3,13 +3,11 @@
 
 package catalog
 
-// TODO: changes made to get mac buildin' again.
-
 import (
 	"github.com/hashicorp/nomad/drivers/docker"
-	// "github.com/hashicorp/nomad/drivers/exec"
-	// "github.com/hashicorp/nomad/drivers/java"
-	// "github.com/hashicorp/nomad/drivers/qemu"
+	"github.com/hashicorp/nomad/drivers/exec"
+	"github.com/hashicorp/nomad/drivers/java"
+	"github.com/hashicorp/nomad/drivers/qemu"
 	"github.com/hashicorp/nomad/drivers/rawexec"
 )
 
@@ -18,8 +16,8 @@ import (
 // register_XXX.go file.
 func init() {
 	RegisterDeferredConfig(rawexec.PluginID, rawexec.PluginConfig, rawexec.PluginLoader)
-	// Register(exec.PluginID, exec.PluginConfig)
-	// Register(qemu.PluginID, qemu.PluginConfig)
-	// Register(java.PluginID, java.PluginConfig)
+	Register(exec.PluginID, exec.PluginConfig)
+	Register(qemu.PluginID, qemu.PluginConfig)
+	Register(java.PluginID, java.PluginConfig)
 	RegisterDeferredConfig(docker.PluginID, docker.PluginConfig, docker.PluginLoader)
 }