diff --git a/terraform/eval_type.go b/terraform/eval_type.go
deleted file mode 100644
index 52dfa5bd5..000000000
--- a/terraform/eval_type.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package terraform
-
-// This separate file for EvalType exists so that stringer below
-// can work without error. See this thread for more details:
-//
-// http://comments.gmane.org/gmane.comp.lang.go.general/148740
-
-//go:generate stringer -type=EvalType eval_type.go
-
-// EvalType is the type of any value returned by an EvalNode. This is
-// used for type checking.
-type EvalType uint32
-
-const (
-	EvalTypeInvalid             EvalType = 0
-	EvalTypeNull                EvalType = 1 << iota // nil
-	EvalTypeConfig                                   // *ResourceConfig
-	EvalTypeResourceProvider                         // ResourceProvider
-	EvalTypeResourceProvisioner                      // ResourceProvisioner
-	EvalTypeInstanceDiff                             // *InstanceDiff
-	EvalTypeInstanceState                            // *InstanceState
-)
diff --git a/terraform/evaltype_string.go b/terraform/evaltype_string.go
deleted file mode 100644
index f37d69806..000000000
--- a/terraform/evaltype_string.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// generated by stringer -type=EvalType eval_type.go; DO NOT EDIT
-
-package terraform
-
-import "fmt"
-
-const (
-	_EvalType_name_0 = "EvalTypeInvalid"
-	_EvalType_name_1 = "EvalTypeNull"
-	_EvalType_name_2 = "EvalTypeConfig"
-	_EvalType_name_3 = "EvalTypeResourceProvider"
-	_EvalType_name_4 = "EvalTypeResourceProvisioner"
-	_EvalType_name_5 = "EvalTypeInstanceDiff"
-	_EvalType_name_6 = "EvalTypeInstanceState"
-)
-
-var (
-	_EvalType_index_0 = [...]uint8{0, 15}
-	_EvalType_index_1 = [...]uint8{0, 12}
-	_EvalType_index_2 = [...]uint8{0, 14}
-	_EvalType_index_3 = [...]uint8{0, 24}
-	_EvalType_index_4 = [...]uint8{0, 27}
-	_EvalType_index_5 = [...]uint8{0, 20}
-	_EvalType_index_6 = [...]uint8{0, 21}
-)
-
-func (i EvalType) String() string {
-	switch {
-	case i == 0:
-		return _EvalType_name_0
-	case i == 2:
-		return _EvalType_name_1
-	case i == 4:
-		return _EvalType_name_2
-	case i == 8:
-		return _EvalType_name_3
-	case i == 16:
-		return _EvalType_name_4
-	case i == 32:
-		return _EvalType_name_5
-	case i == 64:
-		return _EvalType_name_6
-	default:
-		return fmt.Sprintf("EvalType(%d)", i)
-	}
-}