diff --git a/plugins/providers/hyperv/action.rb b/plugins/providers/hyperv/action.rb
index c2ca42694..a801ad346 100644
--- a/plugins/providers/hyperv/action.rb
+++ b/plugins/providers/hyperv/action.rb
@@ -1,9 +1,5 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
 require "pathname"
+
 require "vagrant/action/builder"
 
 module VagrantPlugins
diff --git a/plugins/providers/hyperv/action/import.rb b/plugins/providers/hyperv/action/import.rb
index 25e834935..e7def6156 100644
--- a/plugins/providers/hyperv/action/import.rb
+++ b/plugins/providers/hyperv/action/import.rb
@@ -1,9 +1,5 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
 require "log4r"
+
 module VagrantPlugins
   module HyperV
     module Action
diff --git a/plugins/providers/hyperv/communicator.rb b/plugins/providers/hyperv/communicator.rb
index 883992bb8..3fca58482 100644
--- a/plugins/providers/hyperv/communicator.rb
+++ b/plugins/providers/hyperv/communicator.rb
@@ -1,8 +1,3 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
 module VagrantPlugins
   module HyperV
     module Communicator
diff --git a/plugins/providers/hyperv/config.rb b/plugins/providers/hyperv/config.rb
index 5d16c04b4..8c8c5a0a6 100644
--- a/plugins/providers/hyperv/config.rb
+++ b/plugins/providers/hyperv/config.rb
@@ -1,11 +1,7 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
 require "vagrant"
 require_relative "guest_config/config"
 require_relative "host_share/config"
+
 module VagrantPlugins
   module HyperV
     class Config < Vagrant.plugin("2", :config)
@@ -13,6 +9,7 @@ module VagrantPlugins
       #
       # @return [Boolean]
       attr_accessor :gui
+
       attr_reader :host_share, :guest
 
       def host_config(&block)
@@ -44,7 +41,6 @@ module VagrantPlugins
         end
         { "HyperV" => errors }
       end
-
     end
   end
 end
diff --git a/plugins/providers/hyperv/driver/base.rb b/plugins/providers/hyperv/driver/base.rb
index d9dbb636f..70d337a40 100644
--- a/plugins/providers/hyperv/driver/base.rb
+++ b/plugins/providers/hyperv/driver/base.rb
@@ -1,8 +1,3 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-require "debugger"
 require "json"
 require "vagrant/util/which"
 require "vagrant/util/subprocess"
diff --git a/plugins/providers/hyperv/plugin.rb b/plugins/providers/hyperv/plugin.rb
index 5fdff60af..666400c6c 100644
--- a/plugins/providers/hyperv/plugin.rb
+++ b/plugins/providers/hyperv/plugin.rb
@@ -1,75 +1,20 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
-begin
-  require "vagrant"
-rescue LoadError
-  raise "The Vagrant Hyper-V plugin must be run within Vagrant."
-end
-
-# This is a sanity check to make sure no one is attempting to install
-# this into an early Vagrant version.
-if Vagrant::VERSION < "1.3.5"
-  raise "The Vagrant Hyper-V plugin is only compatible with Vagrant 1.3+"
-end
-
 module VagrantPlugins
   module HyperV
     class Plugin < Vagrant.plugin("2")
-      name "HyperV"
+      name "Hyper-V provider"
       description <<-DESC
       This plugin installs a provider that allows Vagrant to manage
       machines in Hyper-V.
       DESC
 
-      config(:hyperv, :provider) do
-        require_relative "config"
-        Config
-      end
-
       provider(:hyperv, parallel: true) do
-        # Setup logging and i18n
-        # setup_logging
-        # setup_i18n
-
-        # Return the provider
         require_relative "provider"
         Provider
       end
 
-      # This initializes the internationalization strings.
-      def self.setup_i18n
-
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-        level = nil
-        begin
-          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
-        rescue NameError
-          # This means that the logging constant wasn't found,
-          # which is fine. We just keep `level` as `nil`. But
-          # we tell the user.
-          level = nil
-        end
-
-        # Some constants, such as "true" resolve to booleans, so the
-        # above error checking doesn't catch it. This will check to make
-        # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
-
-        # Set the logging level on all "vagrant" namespaced
-        # logs as long as we have a valid level.
-        if level
-          logger = Log4r::Logger.new("vagrant_hyperv")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
+      config(:hyperv, :provider) do
+        require_relative "config"
+        Config
       end
     end
   end
diff --git a/plugins/providers/hyperv/provider.rb b/plugins/providers/hyperv/provider.rb
index f1bfcd4a2..4e60f5869 100644
--- a/plugins/providers/hyperv/provider.rb
+++ b/plugins/providers/hyperv/provider.rb
@@ -1,14 +1,8 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
 require "log4r"
-require "vagrant"
 
 module VagrantPlugins
   module HyperV
     class Provider < Vagrant.plugin("2", :provider)
-
       def initialize(machine)
         @machine = machine
       end
@@ -30,7 +24,6 @@ module VagrantPlugins
         state_id = env[:machine_state_id]
 
         # Get the short and long description
-        # TODO
         short = "Machine's current state is #{state_id}"
         long  = ""
 
diff --git a/plugins/providers/hyperv/scripts/import_vm.ps1 b/plugins/providers/hyperv/scripts/import_vm.ps1
index 587d0394b..42de437ee 100644
--- a/plugins/providers/hyperv/scripts/import_vm.ps1
+++ b/plugins/providers/hyperv/scripts/import_vm.ps1
@@ -1,9 +1,3 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
-
 param (
     [string]$vm_xml_config = $(throw "-vm_xml_config is required."),
     [string]$vhdx_path = $(throw "-vhdx_path is required.")
diff --git a/plugins/providers/hyperv/version.rb b/plugins/providers/hyperv/version.rb
deleted file mode 100644
index 6278a48c7..000000000
--- a/plugins/providers/hyperv/version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-#-------------------------------------------------------------------------
-# Copyright (c) Microsoft Open Technologies, Inc.
-# All Rights Reserved. Licensed under the MIT License.
-#--------------------------------------------------------------------------
-
-module VagrantPlugins
-  module HyperV
-    VERSION = "0.0.1"
-  end
-end