diff --git a/README.rst b/README.rst
index fe06a85..eb2e119 100644
--- a/README.rst
+++ b/README.rst
@@ -741,7 +741,7 @@
           engine: ml2
           tenant_network_types: "flat,vlan" # Can be mixed flat,vlan,vxlan
           tenant_vlan_range: "1000:2000"
-          external_vlan_range: "100:200" # Does not have to be defined.
+          external_vlan_range: "100:200" # Does not have to be defined. Use "0:4096" for accepting all vlans.
           external_mtu: 9000
           mechanism:
             ovs:
diff --git a/_modules/neutronv2/common.py b/_modules/neutronv2/common.py
index 88c08b6..232112b 100644
--- a/_modules/neutronv2/common.py
+++ b/_modules/neutronv2/common.py
@@ -120,7 +120,11 @@
     return wrap
 
 def wait_for_api_ready(cloud_name, retries=1, retry_timeout=10, **kwargs):
-
+    # Remove salt internal kwargs
+    kwarg_keys = list(kwargs.keys())
+    for k in kwarg_keys:
+        if k.startswith('__'):
+            kwargs.pop(k)
     adapter = _get_raw_client(cloud_name)
     response = None
     for i in range(1, retries+1):