diff --git a/common/state/state.c b/common/state/state.c
index 94a423b..8369aed 100644
--- a/common/state/state.c
+++ b/common/state/state.c
@@ -271,7 +271,6 @@
 
 		sv->name = name;
 		sv->start = start_size[0];
-		sv->type = vtype->type;
 		state_add_var(state, sv);
 	} else {
 		sv = state_find_var(state, name);
diff --git a/common/state/state.h b/common/state/state.h
index ead8cc8..81aaec2 100644
--- a/common/state/state.h
+++ b/common/state/state.h
@@ -114,20 +114,10 @@
 	STATE_CONVERT_FIXUP,
 };
 
-enum state_variable_type {
-	STATE_TYPE_INVALID = 0,
-	STATE_TYPE_ENUM,
-	STATE_TYPE_U8,
-	STATE_TYPE_U32,
-	STATE_TYPE_MAC,
-	STATE_TYPE_STRING,
-};
-
 struct state_variable;
 
 /* A variable type (uint32, enum32) */
 struct variable_type {
-	enum state_variable_type type;
 	const char *type_name;
 	struct list_head list;
 	int (*export) (struct state_variable *, struct device_node *,
@@ -141,7 +131,6 @@
 /* instance of a single variable */
 struct state_variable {
 	struct state *state;
-	enum state_variable_type type;
 	struct list_head list;
 	const char *name;
 	unsigned int start;
diff --git a/common/state/state_variables.c b/common/state/state_variables.c
index fd072a0..5b8e628 100644
--- a/common/state/state_variables.c
+++ b/common/state/state_variables.c
@@ -439,31 +439,26 @@
 
 static struct variable_type types[] = {
 	{
-		.type = STATE_TYPE_U8,
 		.type_name = "uint8",
 		.export = state_uint32_export,
 		.import = state_uint32_import,
 		.create = state_uint8_create,
 	}, {
-		.type = STATE_TYPE_U32,
 		.type_name = "uint32",
 		.export = state_uint32_export,
 		.import = state_uint32_import,
 		.create = state_uint32_create,
 	}, {
-		.type = STATE_TYPE_ENUM,
 		.type_name = "enum32",
 		.export = state_enum32_export,
 		.import = state_enum32_import,
 		.create = state_enum32_create,
 	}, {
-		.type = STATE_TYPE_MAC,
 		.type_name = "mac",
 		.export = state_mac_export,
 		.import = state_mac_import,
 		.create = state_mac_create,
 	}, {
-		.type = STATE_TYPE_STRING,
 		.type_name = "string",
 		.export = state_string_export,
 		.import = state_string_import,