diff --git a/nova/compute/api.py b/nova/compute/api.py
index edc96d5ea14c..432658bbb8c0 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -903,7 +903,7 @@ class API(base.Base):
         self._cast_compute_message('add_fixed_ip_to_instance', context,
                                    instance_id,
                                    params=dict(network_id=network_id))
-        
+
     @scheduler_api.reroute_compute("remove_fixed_ip")
     def remove_fixed_ip(self, context, instance_id, address):
         """Remove fixed_ip from specified network to given instance."""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3f8fc809e6e5..c627d2985310 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1361,7 +1361,7 @@ class ComputeManager(manager.SchedulerDependentManager):
             error_list.append(ex)
 
         try:
-            pass #self._poll_instance_states(context)
+            self._poll_instance_states(context)
         except Exception as ex:
             LOG.warning(_("Error during instance poll: %s"),
                         unicode(ex))
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index b5476fcb00d7..178279d31e03 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -244,7 +244,7 @@ class ComputeDriver(object):
 
     def inject_network_info(self, instance, nw_info):
         """inject network info for specified instance"""
-        pass # raise NotImplementedError()
+        pass
 
     def poll_rescued_instances(self, timeout):
         """Poll for rescued instances"""