diff --git a/lib/distractions.js b/lib/distractions.js
index 2032870..79b557b 100644
--- a/lib/distractions.js
+++ b/lib/distractions.js
@@ -30,4 +30,4 @@ function createDistraction() {
 
 module.exports = {
     createDistraction: createDistraction
-}
+};
diff --git a/lib/do_wait_instance.js b/lib/do_wait_instance.js
index a75b31c..d48e20b 100644
--- a/lib/do_wait_instance.js
+++ b/lib/do_wait_instance.js
@@ -4,10 +4,8 @@
  * `triton wait-instance ...`
  */
 
-var format = require('util').format;
 var vasync = require('vasync');
 
-var common = require('./common');
 var distractions = require('./distractions');
 var errors = require('./errors');
 
@@ -46,7 +44,7 @@ function do_wait_instance(subcmd, opts, args, cb) {
                         }
                         nextInst();
                     });
-                },
+                }
             }, next);
         },
 
@@ -67,7 +65,6 @@ function do_wait_instance(subcmd, opts, args, cb) {
                     idsToWaitFor.length, states.join(', '));
             }
 
-            var distraction;
             if (false /* TODO: need BigSpinner.log first */
                 && !opts.quiet && process.stderr.isTTY)
             {
@@ -98,40 +95,6 @@ function do_wait_instance(subcmd, opts, args, cb) {
         }
         cb(err);
     });
-
-
-    function go1() {
-        if (--i > 0)
-            return;
-
-        var uuids = Object.keys(machines);
-        var num = uuids.length;
-        i = num;
-
-        if (num === 0) {
-            cb();
-            return;
-        }
-
-        uuids.forEach(function (id) {
-            var waitOpts = {
-                id: id,
-                states: states
-            };
-            self.triton.cloudapi.waitForMachineStates(waitOpts,
-                    function (err, body, res) {
-                if (err) {
-                    cb(err);
-                    return;
-                }
-                log('%d/%d: %s moved to state %s',
-                    ++done, ids.length, body.name, body.state);
-                if (--i === 0) {
-                    cb();
-                }
-            });
-        });
-    }
 }
 
 do_wait_instance.aliases = ['wait'];