--- a/testing/mozbase/mozrunner/mozrunner/devices/base.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/base.py
@@ -5,21 +5,19 @@ from ConfigParser import (
     ConfigParser,
     RawConfigParser
 )
 import datetime
 import os
 import posixpath
 import re
 import shutil
-import socket
 import subprocess
 import tempfile
 import time
-import traceback
 
 from mozdevice import DMError
 from mozprocess import ProcessHandler
 
 
 class Device(object):
     connected = False
     logcat_proc = None
@@ -201,31 +199,16 @@ class Device(object):
                 if (re.search(r'UP\s+[1-9]\d{0,2}\.\d{1,3}\.\d{1,3}\.\d{1,3}', line)):
                     active = True
                     break
                 line = proc.stdout.readline()
             time_out += 1
             time.sleep(1)
         return active
 
-    def wait_for_port(self, port, timeout=300):
-        starttime = datetime.datetime.now()
-        while datetime.datetime.now() - starttime < datetime.timedelta(seconds=timeout):
-            try:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.connect(('localhost', port))
-                data = sock.recv(16)
-                sock.close()
-                if ':' in data:
-                    return True
-            except:
-                traceback.print_exc()
-            time.sleep(1)
-        return False
-
     def backup_file(self, remote_path):
         if not self.restore:
             return
 
         if self.dm.fileExists(remote_path) or self.dm.dirExists(remote_path):
             self.dm.copyTree(remote_path, '%s.orig' % remote_path)
             self.backup_files.add(remote_path)
         else: