diff --git a/futurehome/config.yaml b/futurehome/config.yaml
index 0fb6955..2d8b466 100644
--- a/futurehome/config.yaml
+++ b/futurehome/config.yaml
@@ -1,6 +1,6 @@
 # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config
 name: Futurehome
-version: "0.0.37"
+version: "0.0.38"
 slug: futurehome
 description: Local Futurehome Smarthub integration
 url: "https://github.com/adrianjagielak/home-assistant-futurehome"
diff --git a/futurehome/src/ha/abbreviate_ha_mqtt_keys.ts b/futurehome/src/ha/abbreviate_ha_mqtt_keys.ts
index b2b8ee2..c9f78f4 100644
--- a/futurehome/src/ha/abbreviate_ha_mqtt_keys.ts
+++ b/futurehome/src/ha/abbreviate_ha_mqtt_keys.ts
@@ -89,24 +89,17 @@ const abbrevMap: { [key: string]: string } = {
   json_attributes_topic: 'json_attr_t',
   json_attributes_template: 'json_attr_tpl',
   last_reset_value_template: 'lrst_val_tpl',
-  max: 'max',
-  min: 'min',
   max_humidity: 'max_hum',
   min_humidity: 'min_hum',
   max_mireds: 'max_mirs',
   min_mireds: 'min_mirs',
   max_kelvin: 'max_k',
   min_kelvin: 'min_k',
-  max_temp: 'max_temp',
-  min_temp: 'min_temp',
   migrate_discovery: 'migr_discvry',
-  mode: 'mode',
   mode_command_template: 'mode_cmd_tpl',
   mode_command_topic: 'mode_cmd_t',
   mode_state_topic: 'mode_stat_t',
   mode_state_template: 'mode_stat_tpl',
-  modes: 'modes',
-  name: 'name',
   origin: 'o',
   object_id: 'obj_id',
   off_delay: 'off_dly',
@@ -187,7 +180,6 @@ const abbrevMap: { [key: string]: string } = {
   rgbww_state_topic: 'rgbww_stat_t',
   rgbww_value_template: 'rgbww_val_tpl',
   send_command_topic: 'send_cmd_t',
-  send_if_off: 'send_if_off',
   set_fan_speed_topic: 'set_fan_spd_t',
   set_position_template: 'set_pos_tpl',
   set_position_topic: 'set_pos_t',
@@ -212,7 +204,6 @@ const abbrevMap: { [key: string]: string } = {
   state_topic: 'stat_t',
   state_template: 'stat_tpl',
   state_value_template: 'stat_val_tpl',
-  step: 'step',
   start_mowing_command_topic: 'strt_mw_cmd_t',
   start_mowing_command_template: 'strt_mw_cmd_tpl',
   subtype: 'stype',
@@ -230,7 +221,6 @@ const abbrevMap: { [key: string]: string } = {
   swing_mode_command_topic: 'swing_mode_cmd_t',
   swing_mode_state_template: 'swing_mode_stat_tpl',
   swing_mode_state_topic: 'swing_mode_stat_t',
-  swing_modes: 'swing_modes',
   temperature_command_template: 'temp_cmd_tpl',
   temperature_command_topic: 'temp_cmd_t',
   temperature_high_command_template: 'temp_hi_cmd_tpl',
@@ -247,8 +237,6 @@ const abbrevMap: { [key: string]: string } = {
   tilt_closed_value: 'tilt_clsd_val',
   tilt_command_topic: 'tilt_cmd_t',
   tilt_command_template: 'tilt_cmd_tpl',
-  tilt_max: 'tilt_max',
-  tilt_min: 'tilt_min',
   tilt_opened_value: 'tilt_opnd_val',
   tilt_optimistic: 'tilt_opt',
   tilt_status_topic: 'tilt_status_t',