diff --git a/lib/puppet/provider/nova_admin/default.rb b/lib/puppet/provider/nova_admin/default.rb
deleted file mode 100644
index 2fbb504b5..000000000
--- a/lib/puppet/provider/nova_admin/default.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Puppet::Type.type(:nova_admin).provide(:default) do
-
-  desc "This is a default provider that does nothing. This allows us to install nova-manage on the same puppet run where we want to use it."
-
-  def create
-    return false
-  end
-
-  def destroy
-    return false
-  end
-
-  def exists?
-    fail('This is just the default provider for nova_admin, all it does is fail')
-  end
-end
diff --git a/lib/puppet/provider/nova_admin/nova_manage.rb b/lib/puppet/provider/nova_admin/nova_manage.rb
index fdd2bea25..6dd4cb47c 100644
--- a/lib/puppet/provider/nova_admin/nova_manage.rb
+++ b/lib/puppet/provider/nova_admin/nova_manage.rb
@@ -2,9 +2,7 @@ Puppet::Type.type(:nova_admin).provide(:nova_manage) do
 
   desc "Manage nova admin user"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     nova_manage("user", "list").match(/^#{resource[:name]}$/)
diff --git a/lib/puppet/provider/nova_network/default.rb b/lib/puppet/provider/nova_network/default.rb
deleted file mode 100644
index d86c30772..000000000
--- a/lib/puppet/provider/nova_network/default.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Puppet::Type.type(:nova_network).provide(:default) do
-
-  desc "This is a default provider that does nothing. This allows us to install nova-manage on the same puppet run where we want to use it."
-
-  def create
-    return false
-  end
-
-  def destroy
-    return false
-  end
-
-  def exists?
-    fail('This is just the default provider for nova_admin, all it does is fail')
-  end
-end
diff --git a/lib/puppet/provider/nova_network/nova_manage.rb b/lib/puppet/provider/nova_network/nova_manage.rb
index ed838536d..e50af1e46 100644
--- a/lib/puppet/provider/nova_network/nova_manage.rb
+++ b/lib/puppet/provider/nova_network/nova_manage.rb
@@ -2,9 +2,7 @@ Puppet::Type.type(:nova_network).provide(:nova_manage) do
 
   desc "Manage nova network"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     begin
diff --git a/lib/puppet/provider/nova_project/default.rb b/lib/puppet/provider/nova_project/default.rb
deleted file mode 100644
index 2747fb98b..000000000
--- a/lib/puppet/provider/nova_project/default.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-Puppet::Type.type(:nova_project).provide(:default) do
-
-  desc "This is a default provider that does nothing. This allows us to install nova-manage on the same puppet run where we want to use it."
-
-  def create
-    return false
-  end
-
-  def destroy
-    return false
-  end
-
-  def exists?
-    fail('This is just the default provider for nova_project, all it does is fail')
-  end
-
-end
diff --git a/lib/puppet/provider/nova_project/nova_manage.rb b/lib/puppet/provider/nova_project/nova_manage.rb
index 42ad1ffaf..31a818f72 100644
--- a/lib/puppet/provider/nova_project/nova_manage.rb
+++ b/lib/puppet/provider/nova_project/nova_manage.rb
@@ -2,9 +2,7 @@ Puppet::Type.type(:nova_project).provide(:nova_manage) do
 
   desc "Manage nova project"
 
-  defaultfor :kernel => 'Linux'
-
-  commands :nova_manage => 'nova-manage'
+  optional_commands :nova_manage => 'nova-manage'
 
   def exists?
     nova_manage("project", "list").match(/^#{resource[:name]}$/)
diff --git a/manifests/manage/network.pp b/manifests/manage/network.pp
index c6e885f1e..0ff6025e0 100644
--- a/manifests/manage/network.pp
+++ b/manifests/manage/network.pp
@@ -7,7 +7,6 @@ define nova::manage::network ( $network, $available_ips ) {
     ensure        => present,
     network       => $network,
     available_ips => $available_ips,
-    provider      => 'nova_manage',
     notify        => Exec["nova-db-sync"],
   }
 }
diff --git a/manifests/manage/project.pp b/manifests/manage/project.pp
index a7890c639..493e99263 100644
--- a/manifests/manage/project.pp
+++ b/manifests/manage/project.pp
@@ -5,7 +5,6 @@ define nova::manage::project ( $owner ) {
 
   nova_project { $name:
     ensure   => present,
-    provider => 'nova_manage',
     owner    => $owner,
     notify   => Exec["nova-db-sync"],
     require  => Nova::Manage::Admin[$owner],