diff --git a/os_faults/__init__.py b/os_faults/__init__.py
index 3375411..a3f72a3 100644
--- a/os_faults/__init__.py
+++ b/os_faults/__init__.py
@@ -93,15 +93,6 @@ CONFIG_SCHEMA = {
             'required': ['driver'],
             'additionalProperties': False,
         },
-        'power_management': {
-            'type': 'object',
-            'properties': {
-                'driver': {'type': 'string'},
-                'args': {'type': 'object'},
-            },
-            'required': ['driver', 'args'],
-            'additionalProperties': False,
-        },
         'power_managements': {
             'type': 'array',
             'items': {
@@ -179,17 +170,6 @@ def connect(cloud_config=None, config_filename=None):
             pm = _init_driver(pm_conf)
             cloud_management.add_power_management(pm)
 
-    power_management_conf = cloud_config.get('power_management')
-    if power_management_conf:
-        if power_managements_conf:
-            raise error.OSFError('Please use only power_managements')
-        else:
-            LOG.warning('power_management is deprecated, use '
-                        'power_managements instead.')
-
-        power_management = _init_driver(power_management_conf)
-        cloud_management.add_power_management(power_management)
-
     return cloud_management
 
 
diff --git a/os_faults/api/node_collection.py b/os_faults/api/node_collection.py
index 6d12fcf..e7350e7 100644
--- a/os_faults/api/node_collection.py
+++ b/os_faults/api/node_collection.py
@@ -13,7 +13,6 @@
 
 import logging
 import random
-import warnings
 
 from os_faults.api import error
 from os_faults.api.utils import public
@@ -99,11 +98,6 @@ class NodeCollection(utils.ReprMixin):
     def get_fqdns(self):
         return [host.fqdn for host in self.hosts]
 
-    def iterate_hosts(self):
-        warnings.warn('iterate_hosts is deprecated, use __iter__ instead',
-                      DeprecationWarning, stacklevel=2)
-        return self.__iter__()
-
     def pick(self, count=1):
         """Pick one Node out of collection
 
diff --git a/os_faults/tests/unit/api/test_node_collection.py b/os_faults/tests/unit/api/test_node_collection.py
index 7e2649d..ba9d157 100644
--- a/os_faults/tests/unit/api/test_node_collection.py
+++ b/os_faults/tests/unit/api/test_node_collection.py
@@ -122,10 +122,6 @@ class NodeCollectionTestCase(test.TestCase):
     def test_iter(self):
         self.assertEqual(self.hosts, list(self.node_collection))
 
-    def test_iterate_hosts(self):
-        self.assertEqual(self.hosts,
-                         list(self.node_collection.iterate_hosts()))
-
     def test_get_ips(self):
         self.assertEqual(['10.0.0.2', '10.0.0.3', '10.0.0.4', '10.0.0.5'],
                          self.node_collection.get_ips())
diff --git a/os_faults/tests/unit/test_os_faults.py b/os_faults/tests/unit/test_os_faults.py
index 9d115c4..b122dd6 100644
--- a/os_faults/tests/unit/test_os_faults.py
+++ b/os_faults/tests/unit/test_os_faults.py
@@ -39,12 +39,12 @@ class OSFaultsTestCase(test.TestCase):
                     },
                 }
             },
-            'power_management': {
+            'power_managements': [{
                 'driver': 'libvirt',
                 'args': {
                     'connection_uri': "qemu+ssh://user@10.30.20.21/system"
                 }
-            }
+            }]
         }
 
     def test_connect_devstack(self):
@@ -105,7 +105,7 @@ class OSFaultsTestCase(test.TestCase):
         self.assertEqual(['01:ab:cd:01:ab:cd', '02:ab:cd:02:ab:cd'],
                          nodes.get_macs())
 
-    def test_connect_fuel_with_libvirt(self):
+    def test_connect_with_libvirt(self):
         destructor = os_faults.connect(self.cloud_config)
         self.assertIsInstance(destructor, devstack.DevStackManagement)
         self.assertEqual(1, len(destructor.power_manager.power_drivers))