diff --git a/.gitignore b/.gitignore
index 61bc6fa8c..a23e18aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@
 /website/.sass-cache
 /website/build
 .DS_Store
-*.swp
 .vagrant
 .idea
 test/.env
diff --git a/builder/lxc/artifact.go b/builder/lxc/artifact.go
index 9e34bd2fd..9ac57d0cc 100644
--- a/builder/lxc/artifact.go
+++ b/builder/lxc/artifact.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go
index ea483dda1..7d630fe44 100644
--- a/builder/lxc/builder.go
+++ b/builder/lxc/builder.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/command.go b/builder/lxc/command.go
index 878a3ce2c..af81cff83 100644
--- a/builder/lxc/command.go
+++ b/builder/lxc/command.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go
index 4e3b575bc..4d6fab911 100644
--- a/builder/lxc/communicator.go
+++ b/builder/lxc/communicator.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/config.go b/builder/lxc/config.go
index 79d4653b3..4c4152592 100644
--- a/builder/lxc/config.go
+++ b/builder/lxc/config.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go
index 4763d0b68..3af9ed7f3 100644
--- a/builder/lxc/step_export.go
+++ b/builder/lxc/step_export.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
@@ -98,4 +96,4 @@ func (s *stepExport) SudoCommand(args ...string) error {
 	log.Printf("stderr: %s", stderrString)
 
 	return err
-}
+}
\ No newline at end of file
diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go
index f78804a5d..070eae680 100644
--- a/builder/lxc/step_lxc_create.go
+++ b/builder/lxc/step_lxc_create.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go
index ccd0fc2c3..4b66c0c87 100644
--- a/builder/lxc/step_prepare_output_dir.go
+++ b/builder/lxc/step_prepare_output_dir.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go
index 913e86d70..b8fe6cd04 100644
--- a/builder/lxc/step_provision.go
+++ b/builder/lxc/step_provision.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (
diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go
index c83910bc4..d2d58628a 100644
--- a/builder/lxc/step_wait_init.go
+++ b/builder/lxc/step_wait_init.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package lxc
 
 import (