diff --git a/c_gen/type_maps.py b/c_gen/type_maps.py
index 2a53519..875a34e 100644
--- a/c_gen/type_maps.py
+++ b/c_gen/type_maps.py
@@ -477,86 +477,6 @@
             arr_len = len(ar)
     return arr_len
 
-# FIXME:  Need to move update for multipart messages
-
-stats_reply_list = [
-    "of_aggregate_stats_reply",
-    "of_desc_stats_reply",
-    "of_experimenter_stats_reply",
-    "of_flow_stats_reply",
-    "of_group_stats_reply",
-    "of_group_desc_stats_reply",
-    "of_group_features_stats_reply",
-    "of_meter_stats_reply",
-    "of_meter_config_stats_reply",
-    "of_meter_features_stats_reply",
-    "of_port_stats_reply",
-    "of_port_desc_stats_reply",
-    "of_queue_stats_reply",
-    "of_table_stats_reply",
-    "of_table_features_stats_reply",
-    "of_bsn_stats_reply",
-    "of_bsn_lacp_stats_reply",
-    "of_bsn_switch_pipeline_stats_reply",
-    "of_bsn_port_counter_stats_reply",
-    "of_bsn_vlan_counter_stats_reply",
-]
-
-stats_request_list = [
-    "of_aggregate_stats_request",
-    "of_desc_stats_request",
-    "of_experimenter_stats_request",
-    "of_flow_stats_request",
-    "of_group_stats_request",
-    "of_group_desc_stats_request",
-    "of_group_features_stats_request",
-    "of_meter_stats_request",
-    "of_meter_config_stats_request",
-    "of_meter_features_stats_request",
-    "of_port_stats_request",
-    "of_port_desc_stats_request",
-    "of_queue_stats_request",
-    "of_table_stats_request",
-    "of_table_features_stats_request",
-    "of_bsn_stats_request",
-    "of_bsn_lacp_stats_request",
-    "of_bsn_switch_pipeline_stats_request",
-    "of_bsn_port_counter_stats_request",
-    "of_bsn_vlan_counter_stats_request",
-]
-
-flow_mod_list = [
-    "of_flow_add",
-    "of_flow_modify",
-    "of_flow_modify_strict",
-    "of_flow_delete",
-    "of_flow_delete_strict"
-]
-
-error_msg_list = [
-    "of_hello_failed_error_msg",
-    "of_bad_request_error_msg",
-    "of_bad_action_error_msg",
-    "of_bad_instruction_error_msg",
-    "of_bad_match_error_msg",
-    "of_flow_mod_failed_error_msg",
-    "of_group_mod_failed_error_msg",
-    "of_port_mod_failed_error_msg",
-    "of_table_mod_failed_error_msg",
-    "of_queue_op_failed_error_msg",
-    "of_switch_config_failed_error_msg",
-    "of_role_request_failed_error_msg",
-    "of_meter_mod_failed_error_msg",
-    "of_table_features_failed_error_msg",
-    "of_experimenter_error_msg"
-]
-
-group_mod_list = [
-    "of_group_add",
-    "of_group_modify",
-    "of_group_delete",
-]
-
 def sub_class_map(base_type, version):
     """
     Returns an iterable object giving the instance nameys and subclass types