diff --git a/lib/puppet/provider/neutron.rb b/lib/puppet/provider/neutron.rb
index a425cf428..af9e60b4c 100644
--- a/lib/puppet/provider/neutron.rb
+++ b/lib/puppet/provider/neutron.rb
@@ -24,20 +24,13 @@ class Puppet::Provider::Neutron < Puppet::Provider::Openstack
     fixed_ips.each do |fixed_ip|
       subnet_ids << fixed_ip['subnet_id']
     end
-
-    if subnet_ids.length > 1
-      subnet_ids
-    else
-      subnet_ids.first
-    end
+    # TODO(tkajinam): Support multiple values
+    subnet_ids.first
   end
 
   def self.parse_availability_zone_hint(value)
     hints = JSON.parse(value.gsub(/\\"/,'"').gsub('\'','"'))
-    if hints.length > 1
-      hints
-    else
-      hints.first
-    end
+    # TODO(tkajinam): Support multiple values
+    hints.first
   end
 end
diff --git a/lib/puppet/provider/neutron_port/openstack.rb b/lib/puppet/provider/neutron_port/openstack.rb
index aebc09b3a..efa847367 100644
--- a/lib/puppet/provider/neutron_port/openstack.rb
+++ b/lib/puppet/provider/neutron_port/openstack.rb
@@ -182,11 +182,8 @@ Puppet::Type.type(:neutron_port).provide(
       ips << fixed_ip['ip_address']
     end
 
-    if ips.length > 1
-      ips
-    else
-      ips.first
-    end
+    # TODO(tkajinam): Support multiple values
+    ips.first
   end
 
   def self.parse_binding_profile_interface_name(value)