diff --git a/lib/puppet/type/keystone_domain.rb b/lib/puppet/type/keystone_domain.rb
index b23e4e613..806bfd44a 100644
--- a/lib/puppet/type/keystone_domain.rb
+++ b/lib/puppet/type/keystone_domain.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 Puppet::Type.newtype(:keystone_domain) do
 
   desc <<-EOT
diff --git a/lib/puppet/type/keystone_endpoint.rb b/lib/puppet/type/keystone_endpoint.rb
index 4d858aea0..2b8662bd9 100644
--- a/lib/puppet/type/keystone_endpoint.rb
+++ b/lib/puppet/type/keystone_endpoint.rb
@@ -1,6 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 require 'puppet_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
 
diff --git a/lib/puppet/type/keystone_identity_provider.rb b/lib/puppet/type/keystone_identity_provider.rb
index 0da5b8cbc..7158771ac 100644
--- a/lib/puppet/type/keystone_identity_provider.rb
+++ b/lib/puppet/type/keystone_identity_provider.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 require 'puppet/provider/keystone/util'
 
 Puppet::Type.newtype(:keystone_identity_provider) do
diff --git a/lib/puppet/type/keystone_implied_role.rb b/lib/puppet/type/keystone_implied_role.rb
index 318bde30a..902acc647 100644
--- a/lib/puppet/type/keystone_implied_role.rb
+++ b/lib/puppet/type/keystone_implied_role.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 Puppet::Type.newtype(:keystone_implied_role) do
 
   desc <<-EOT
diff --git a/lib/puppet/type/keystone_role.rb b/lib/puppet/type/keystone_role.rb
index c4e50bbe3..ee143f431 100644
--- a/lib/puppet/type/keystone_role.rb
+++ b/lib/puppet/type/keystone_role.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 Puppet::Type.newtype(:keystone_role) do
 
   desc <<-EOT
diff --git a/lib/puppet/type/keystone_service.rb b/lib/puppet/type/keystone_service.rb
index 5cc53239c..8dcdfe876 100644
--- a/lib/puppet/type/keystone_service.rb
+++ b/lib/puppet/type/keystone_service.rb
@@ -1,6 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 require 'puppet_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
 
diff --git a/lib/puppet/type/keystone_tenant.rb b/lib/puppet/type/keystone_tenant.rb
index 0b532a1cb..e5f2ca0fb 100644
--- a/lib/puppet/type/keystone_tenant.rb
+++ b/lib/puppet/type/keystone_tenant.rb
@@ -1,6 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
 require 'puppet/provider/keystone/util'
 require 'puppet_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
diff --git a/lib/puppet/type/keystone_user.rb b/lib/puppet/type/keystone_user.rb
index fa1887a35..7f0af1a1f 100644
--- a/lib/puppet/type/keystone_user.rb
+++ b/lib/puppet/type/keystone_user.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 require 'puppet/provider/keystone/util'
 require 'puppet_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'
diff --git a/lib/puppet/type/keystone_user_role.rb b/lib/puppet/type/keystone_user_role.rb
index a5f167e59..0df22285d 100644
--- a/lib/puppet/type/keystone_user_role.rb
+++ b/lib/puppet/type/keystone_user_role.rb
@@ -1,7 +1,3 @@
-# LP#1408531
-File.expand_path('../..', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-File.expand_path('../../../../openstacklib/lib', File.dirname(__FILE__)).tap { |dir| $LOAD_PATH.unshift(dir) unless $LOAD_PATH.include?(dir) }
-
 require 'puppet/provider/keystone/util'
 require 'puppet_x/keystone/composite_namevar'
 require 'puppet_x/keystone/type'