diff --git a/src/hb-map.cc b/src/hb-map.cc
index 13089aa04..a29fa1a31 100644
--- a/src/hb-map.cc
+++ b/src/hb-map.cc
@@ -105,8 +105,6 @@ hb_map_destroy (hb_map_t *map)
 {
   if (!hb_object_destroy (map)) return;
 
-  map->fini_shallow ();
-
   hb_free (map);
 }
 
diff --git a/src/hb-map.hh b/src/hb-map.hh
index 6c5d8760b..d5bf81ae3 100644
--- a/src/hb-map.hh
+++ b/src/hb-map.hh
@@ -468,7 +468,7 @@ void hb_hashmap_destroy (hb_hashmap_t<K, V>* map)
 {
   if (!hb_object_destroy (map))
     return;
-  map->fini_shallow ();
+
   hb_free (map);
 }
 
diff --git a/src/hb-object.hh b/src/hb-object.hh
index 19cdb0451..f6c7a5699 100644
--- a/src/hb-object.hh
+++ b/src/hb-object.hh
@@ -272,6 +272,9 @@ static inline bool hb_object_destroy (Type *obj)
     return false;
 
   hb_object_fini (obj);
+
+  obj->~Type ();
+
   return true;
 }
 template <typename Type>
@@ -283,7 +286,7 @@ static inline void hb_object_fini (Type *obj)
   {
     user_data->fini ();
     hb_free (user_data);
-    user_data = nullptr;
+    obj->header.user_data.set_relaxed (nullptr);
   }
 }
 template <typename Type>
diff --git a/src/hb-set.cc b/src/hb-set.cc
index e74c503c3..5bf9d7c8c 100644
--- a/src/hb-set.cc
+++ b/src/hb-set.cc
@@ -105,8 +105,6 @@ hb_set_destroy (hb_set_t *set)
 {
   if (!hb_object_destroy (set)) return;
 
-  set->fini_shallow ();
-
   hb_free (set);
 }
 
diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc
index 3e7173e62..8dbb661cd 100644
--- a/src/hb-shape-plan.cc
+++ b/src/hb-shape-plan.cc
@@ -318,10 +318,6 @@ hb_shape_plan_destroy (hb_shape_plan_t *shape_plan)
 {
   if (!hb_object_destroy (shape_plan)) return;
 
-#ifndef HB_NO_OT_SHAPE
-  shape_plan->ot.fini ();
-#endif
-  shape_plan->key.fini ();
   hb_free (shape_plan);
 }
 
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 3173f4566..8a50ff49a 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -761,7 +761,6 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
   if (!hb_object_destroy (plan)) return;
 
   hb_set_destroy (plan->unicodes);
-  plan->unicode_to_new_gid_list.fini ();
   hb_set_destroy (plan->name_ids);
   hb_set_destroy (plan->name_languages);
   hb_set_destroy (plan->layout_features);
@@ -796,7 +795,6 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
   if (plan->user_axes_location)
   {
     hb_object_destroy (plan->user_axes_location);
-    plan->user_axes_location->fini_shallow ();
     hb_free (plan->user_axes_location);
   }