diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py
index b29872274e..3ea9843cda 100644
--- a/ceilometer/meter/notifications.py
+++ b/ceilometer/meter/notifications.py
@@ -153,7 +153,7 @@ class MeterDefinition(object):
             nb_samples = len(sample['name'])
             # skip if no meters in payload
             if nb_samples <= 0:
-                raise StopIteration
+                return
 
             attributes = self.SAMPLE_ATTRIBUTES + ["message", "metadata"]
 
@@ -172,7 +172,7 @@ class MeterDefinition(object):
                                 '"%(name)s" field instead of %(total)d.' %
                                 dict(name=name, nb=nb,
                                      total=nb_samples))
-                    raise StopIteration
+                    return
 
             # NOTE(sileht): Transform the sample with multiple values per
             # attribute into multiple samples with one value per attribute.
diff --git a/ceilometer/objectstore/rgw.py b/ceilometer/objectstore/rgw.py
index 970aae31bb..fbf6bcb218 100644
--- a/ceilometer/objectstore/rgw.py
+++ b/ceilometer/objectstore/rgw.py
@@ -85,7 +85,7 @@ class _Base(plugin_base.PollsterBase):
     def _get_account_info(self, ksclient, tenants):
         endpoint = self._get_endpoint(self.conf, ksclient)
         if not endpoint:
-            raise StopIteration()
+            return
 
         try:
             from ceilometer.objectstore import rgw_client as c_rgw_client
diff --git a/ceilometer/objectstore/swift.py b/ceilometer/objectstore/swift.py
index 9f5ce6b394..cff0a510eb 100644
--- a/ceilometer/objectstore/swift.py
+++ b/ceilometer/objectstore/swift.py
@@ -83,7 +83,7 @@ class _Base(plugin_base.PollsterBase):
     def _get_account_info(self, ksclient, tenants):
         endpoint = self._get_endpoint(self.conf, ksclient)
         if not endpoint:
-            raise StopIteration()
+            return
 
         swift_api_method = getattr(swift, '%s_account' % self.METHOD)
         for t in tenants:
diff --git a/ceilometer/publisher/__init__.py b/ceilometer/publisher/__init__.py
index dc50be2bec..499253caff 100644
--- a/ceilometer/publisher/__init__.py
+++ b/ceilometer/publisher/__init__.py
@@ -16,7 +16,6 @@
 
 import abc
 
-import funcsigs
 from oslo_log import log
 from oslo_utils import netutils
 import six
@@ -34,13 +33,7 @@ def get_publisher(conf, url, namespace):
     """
     parse_result = netutils.urlsplit(url)
     loaded_driver = driver.DriverManager(namespace, parse_result.scheme)
-    if len(funcsigs.signature(loaded_driver.driver).parameters) == 2:
-        return loaded_driver.driver(conf, parse_result)
-    else:
-        # We keep it just the time to cleanup panko
-        LOG.warning("%s publisher use the deprecated class signature",
-                    parse_result.scheme)
-        return loaded_driver.driver(parse_result)
+    return loaded_driver.driver(conf, parse_result)
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/requirements.txt b/requirements.txt
index 7422c0977d..d730da3f47 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,6 @@ cachetools>=1.1.0 # MIT License
 cotyledon>=1.3.0 #Apache-2.0
 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
 futurist>=0.11.0 # Apache-2.0
-funcsigs
 debtcollector>=1.2.0 # Apache-2.0
 jsonpath-rw-ext>=0.1.9 # Apache-2.0
 lxml>=2.3 # BSD