Remove internal proxy code, and deprecate related DNA data.

Part of T91671.

Not much else to say, this is mainly a massive deletion of code.

Note that a few cleanups possible after this proxy removal were kept out
of this commit to try to reduce a bit its size.

Reviewed By: sergey, brecht

Maniphest Tasks: T91671

Differential Revision: https://developer.blender.org/D13995

20 files changed, 41 insertions, 785 deletions

diff --git a/source/blender/blenkernel/BKE_action.h b/source/blender/blenkernel/BKE_action.h
index 0b09bfd8730..5d1b4baedfd 100644
--- a/source/blender/blenkernel/BKE_action.h
+++ b/source/blender/blenkernel/BKE_action.h
@@ -365,7 +365,6 @@ void what_does_obaction(struct Object *ob,
                         char groupname[],
                         const struct AnimationEvalContext *anim_eval_context);
 
-/* for proxy */
 void BKE_pose_copy_pchan_result(struct bPoseChannel *pchanto,
                                 const struct bPoseChannel *pchanfrom);
 /**
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 8584ce6f508..12d8135ba55 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -619,14 +619,6 @@ void BKE_pose_eval_cleanup(struct Depsgraph *depsgraph,
                            struct Scene *scene,
                            struct Object *object);
 
-void BKE_pose_eval_proxy_init(struct Depsgraph *depsgraph, struct Object *object);
-void BKE_pose_eval_proxy_done(struct Depsgraph *depsgraph, struct Object *object);
-void BKE_pose_eval_proxy_cleanup(struct Depsgraph *depsgraph, struct Object *object);
-
-void BKE_pose_eval_proxy_copy_bone(struct Depsgraph *depsgraph,
-                                   struct Object *object,
-                                   int pchan_index);
-
 /* -------------------------------------------------------------------- */
 /** \name Deform 3D Coordinates by Armature (armature_deform.c)
  * \{ */
diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 55e5cd0a149..2da79e27576 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -278,18 +278,6 @@ bool BKE_constraint_apply_and_remove_for_pose(struct Depsgraph *depsgraph,
 
 void BKE_constraint_panel_expand(struct bConstraint *con);
 
-/* Constraints + Proxies function prototypes */
-
-/**
- * Rescue all constraints tagged as being #CONSTRAINT_PROXY_LOCAL
- * (i.e. added to bone that's proxy-synced in this file).
- */
-void BKE_constraints_proxylocal_extract(struct ListBase *dst, struct ListBase *src);
-/**
- * Returns if the owner of the constraint is proxy-protected.
- */
-bool BKE_constraints_proxylocked_owner(struct Object *ob, struct bPoseChannel *pchan);
-
 /* Constraint Evaluation function prototypes */
 
 /**
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index ebd35cad965..daf13590ca2 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -376,10 +376,6 @@ enum {
   /** Clear asset data (in case the ID can actually be made local, in copy case asset data is never
    * copied over). */
   LIB_ID_MAKELOCAL_ASSET_DATA_CLEAR = 1 << 3,
-
-  /* Special type-specific options. */
-  /** For Objects, do not clear the proxy pointers while making the data-block local. */
-  LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING = 1 << 16,
 };
 
 /**
diff --git a/source/blender/blenkernel/BKE_lib_query.h b/source/blender/blenkernel/BKE_lib_query.h
index d853cb16b13..dd2e2a2f8e5 100644
--- a/source/blender/blenkernel/BKE_lib_query.h
+++ b/source/blender/blenkernel/BKE_lib_query.h
@@ -63,7 +63,7 @@ enum {
 
   /**
    * That ID is not really used by its owner, it's just an internal hint/helper.
-   * This addresses Their Highest Ugliness the 'from' pointers: Object->from_proxy and Key->from.
+   * This marks the 'from' pointers issue, like Key->from.
    * How to handle that kind of cases totally depends on what caller code is doing... */
   IDWALK_CB_LOOPBACK = (1 << 4),
 
@@ -135,7 +135,6 @@ enum {
   /** Do not process ID pointers inside embedded IDs. Needed by depsgraph processing e.g. */
   IDWALK_IGNORE_EMBEDDED_ID = (1 << 3),
 
-  IDWALK_NO_INDIRECT_PROXY_DATA_USAGE = (1 << 8), /* Ugly special case :(((( */
   /** Also process internal ID pointers like `ID.newid` or `ID.orig_id`.
    *  WARNING: Dangerous, use with caution. */
   IDWALK_DO_INTERNAL_RUNTIME_POINTERS = (1 << 9),
diff --git a/source/blender/blenkernel/BKE_lib_remap.h b/source/blender/blenkernel/BKE_lib_remap.h
index cc970342fbb..f14cd75c5c6 100644
--- a/source/blender/blenkernel/BKE_lib_remap.h
+++ b/source/blender/blenkernel/BKE_lib_remap.h
@@ -68,15 +68,6 @@ enum {
    * and can cause crashes very easily!
    */
   ID_REMAP_FORCE_NEVER_NULL_USAGE = 1 << 3,
-  /**
-   * Do not consider proxy/_group pointers of local objects as indirect usages...
-   * Our oh-so-beloved proxies again...
-   * Do not consider data used by local proxy object as indirect usage.
-   * This is needed e.g. in reload scenario,
-   * since we have to ensure remapping of Armature data of local proxy
-   * is also performed. Usual nightmare...
-   */
-  ID_REMAP_NO_INDIRECT_PROXY_DATA_USAGE = 1 << 4,
   /** Do not remap library override pointers. */
   ID_REMAP_SKIP_OVERRIDE_LIBRARY = 1 << 5,
   /** Don't touch the user count (use for low level actions such as swapping pointers). */
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 99758f4ad78..96ed7942067 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -144,18 +144,6 @@ void BKE_object_link_modifiers(struct Object *ob_dst, const struct Object *ob_sr
 void BKE_object_free_modifiers(struct Object *ob, int flag);
 void BKE_object_free_shaderfx(struct Object *ob, int flag);
 
-/**
- * Proxy rule:
- * - `lib_object->proxy_from` == the one we borrow from, set temporally while object_update.
- * - `local_object->proxy` == pointer to library object, saved in files and read.
- * - `local_object->proxy_group` == pointer to collection dupli-object, saved in files and read.
- */
-void BKE_object_make_proxy(struct Main *bmain,
-                           struct Object *ob,
-                           struct Object *target,
-                           struct Object *cob);
-void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target);
-
 bool BKE_object_exists_check(struct Main *bmain, const struct Object *obtest);
 /**
  * Actual check for internal data, not context or flags.
@@ -444,7 +432,6 @@ void BKE_object_eval_constraints(struct Depsgraph *depsgraph,
                                  struct Object *ob);
 void BKE_object_eval_transform_final(struct Depsgraph *depsgraph, struct Object *ob);
 
-bool BKE_object_eval_proxy_copy(struct Depsgraph *depsgraph, struct Object *object);
 void BKE_object_eval_uber_transform(struct Depsgraph *depsgraph, struct Object *ob);
 void BKE_object_eval_uber_data(struct Depsgraph *depsgraph,
                                struct Scene *scene,
@@ -486,12 +473,6 @@ void BKE_object_handle_data_update(struct Depsgraph *depsgraph,
  */
 void BKE_object_handle_update(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob);
 /**
- * Proxy rule:
- * - lib_object->proxy_from == the one we borrow from, only set temporal and cleared here.
- * - local_object->proxy    == pointer to library object, saved in files and read.
- *
- * Function below is polluted with proxy exceptions, cleanup will follow!
- *
  * The main object update call, for object matrix, constraints, keys and #DispList (modifiers)
  * requires flags to be set!
  *
@@ -501,8 +482,7 @@ void BKE_object_handle_update(struct Depsgraph *depsgraph, struct Scene *scene,
 void BKE_object_handle_update_ex(struct Depsgraph *depsgraph,
                                  struct Scene *scene,
                                  struct Object *ob,
-                                 struct RigidBodyWorld *rbw,
-                                 bool do_proxy_update);
+                                 struct RigidBodyWorld *rbw);
 
 void BKE_object_sculpt_data_create(struct Object *ob);
 
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index fde42304185..8426f6f4676 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1956,30 +1956,15 @@ void BKE_pose_blend_read_lib(BlendLibReader *reader, Object *ob, bPose *pose)
     return;
   }
 
-  /* always rebuild to match proxy or lib changes, but on Undo */
+  /* Always rebuild to match library changes, except on Undo. */
   bool rebuild = false;
 
   if (!BLO_read_lib_is_undo(reader)) {
-    if (ob->proxy || ob->id.lib != arm->id.lib) {
+    if (ob->id.lib != arm->id.lib) {
       rebuild = true;
     }
   }
 
-  if (ob->proxy) {
-    /* sync proxy layer */
-    if (pose->proxy_layer) {
-      arm->layer = pose->proxy_layer;
-    }
-
-    /* sync proxy active bone */
-    if (pose->proxy_act_bone[0]) {
-      Bone *bone = BKE_armature_find_bone_name(arm, pose->proxy_act_bone);
-      if (bone) {
-        arm->act_bone = bone;
-      }
-    }
-  }
-
   LISTBASE_FOREACH (bPoseChannel *, pchan, &pose->chanbase) {
     BKE_constraint_blend_read_lib(reader, (ID *)ob, &pchan->constraints);
 
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 5704ef6e42f..65db5c50102 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -2296,161 +2296,6 @@ void BKE_armature_where_is(bArmature *arm)
 /** \name Pose Rebuild
  * \{ */
 
-/* if bone layer is protected, copy the data from from->pose
- * when used with linked libraries this copies from the linked pose into the local pose */
-static void pose_proxy_sync(Object *ob, Object *from, int layer_protected)
-{
-  bPose *pose = ob->pose, *frompose = from->pose;
-  bPoseChannel *pchan, *pchanp;
-  bConstraint *con;
-  int error = 0;
-
-  if (frompose == NULL) {
-    return;
-  }
-
-  /* in some cases when rigs change, we can't synchronize
-   * to avoid crashing check for possible errors here */
-  for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-    if (pchan->bone->layer & layer_protected) {
-      if (BKE_pose_channel_find_name(frompose, pchan->name) == NULL) {
-        CLOG_ERROR(&LOG,
-                   "failed to sync proxy armature because '%s' is missing pose channel '%s'",
-                   from->id.name,
-                   pchan->name);
-        error = 1;
-      }
-    }
-  }
-
-  if (error) {
-    return;
-  }
-
-  /* clear all transformation values from library */
-  BKE_pose_rest(frompose, false);
-
-  /* copy over all of the proxy's bone groups */
-  /* TODO: for later
-   * - implement 'local' bone groups as for constraints
-   * NOTE: this isn't trivial, as bones reference groups by index not by pointer,
-   *       so syncing things correctly needs careful attention */
-  BLI_freelistN(&pose->agroups);
-  BLI_duplicatelist(&pose->agroups, &frompose->agroups);
-  pose->active_group = frompose->active_group;
-
-  for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
-    pchanp = BKE_pose_channel_find_name(frompose, pchan->name);
-
-    if (UNLIKELY(pchanp == NULL)) {
-      /* happens for proxies that become invalid because of a missing link
-       * for regular cases it shouldn't happen at all */
-    }
-    else if (pchan->bone->layer & layer_protected) {
-      ListBase proxylocal_constraints = {NULL, NULL};
-      bPoseChannel pchanw;
-
-      /* copy posechannel to temp, but restore important pointers */
-      pchanw = *pchanp;
-      pchanw.bone = pchan->bone;
-      pchanw.prev = pchan->prev;
-      pchanw.next = pchan->next;
-      pchanw.parent = pchan->parent;
-      pchanw.child = pchan->child;
-      pchanw.custom_tx = pchan->custom_tx;
-      pchanw.bbone_prev = pchan->bbone_prev;
-      pchanw.bbone_next = pchan->bbone_next;
-
-      pchanw.mpath = pchan->mpath;
-      pchan->mpath = NULL;
-
-      /* Reset runtime data, we don't want to share that with the proxy. */
-      BKE_pose_channel_runtime_reset_on_copy(&pchanw.runtime);
-
-      /* this is freed so copy a copy, else undo crashes */
-      if (pchanw.prop) {
-        pchanw.prop = IDP_CopyProperty(pchanw.prop);
-
-        /* use the values from the existing props */
-        if (pchan->prop) {
-          IDP_SyncGroupValues(pchanw.prop, pchan->prop);
-        }
-      }
-
-      /* Constraints - proxy constraints are flushed... local ones are added after
-       * 1: extract constraints not from proxy (CONSTRAINT_PROXY_LOCAL) from pchan's constraints.
-       * 2: copy proxy-pchan's constraints on-to new.
-       * 3: add extracted local constraints back on top.
-       *
-       * Note for BKE_constraints_copy:
-       * When copying constraints, disable 'do_extern' otherwise
-       * we get the libs direct linked in this blend.
-       */
-      BKE_constraints_proxylocal_extract(&proxylocal_constraints, &pchan->constraints);
-      BKE_constraints_copy(&pchanw.constraints, &pchanp->constraints, false);
-      BLI_movelisttolist(&pchanw.constraints, &proxylocal_constraints);
-
-      /* constraints - set target ob pointer to own object */
-      for (con = pchanw.constraints.first; con; con = con->next) {
-        const bConstraintTypeInfo *cti = BKE_constraint_typeinfo_get(con);
-        ListBase targets = {NULL, NULL};
-        bConstraintTarget *ct;
-
-        if (cti && cti->get_constraint_targets) {
-          cti->get_constraint_targets(con, &targets);
-
-          for (ct = targets.first; ct; ct = ct->next) {
-            if (ct->tar == from) {
-              ct->tar = ob;
-            }
-          }
-
-          if (cti->flush_constraint_targets) {
-            cti->flush_constraint_targets(con, &targets, 0);
-          }
-        }
-      }
-
-      /* free stuff from current channel */
-      BKE_pose_channel_free(pchan);
-
-      /* copy data in temp back over to the cleaned-out (but still allocated) original channel */
-      *pchan = pchanw;
-      if (pchan->custom) {
-        id_us_plus(&pchan->custom->id);
-      }
-    }
-    else {
-      /* always copy custom shape */
-      pchan->custom = pchanp->custom;
-      if (pchan->custom) {
-        id_us_plus(&pchan->custom->id);
-      }
-      if (pchanp->custom_tx) {
-        pchan->custom_tx = BKE_pose_channel_find_name(pose, pchanp->custom_tx->name);
-      }
-
-      /* ID-Property Syncing */
-      {
-        IDProperty *prop_orig = pchan->prop;
-        if (pchanp->prop) {
-          pchan->prop = IDP_CopyProperty(pchanp->prop);
-          if (prop_orig) {
-            /* copy existing values across when types match */
-            IDP_SyncGroupValues(pchan->prop, prop_orig);
-          }
-        }
-        else {
-          pchan->prop = NULL;
-        }
-        if (prop_orig) {
-          IDP_FreeProperty(prop_orig);
-        }
-      }
-    }
-  }
-}
-
 /**
  * \param r_last_visited_bone_p: The last bone handled by the last call to this function.
  */
@@ -2579,16 +2424,6 @@ void BKE_pose_rebuild(Main *bmain, Object *ob, bArmature *arm, const bool do_id_
 
   // printf("rebuild pose %s, %d bones\n", ob->id.name, counter);
 
-  /* synchronize protected layers with proxy */
-  /* HACK! To preserve 2.7x behavior that you always can pose even locked bones,
-   * do not do any restoration if this is a COW temp copy! */
-  /* Switched back to just NO_MAIN tag, for some reasons (c)
-   * using COW tag was working this morning, but not anymore... */
-  if (ob->proxy != NULL && (ob->id.tag & LIB_TAG_NO_MAIN) == 0) {
-    BKE_object_copy_proxy_drivers(ob, ob->proxy);
-    pose_proxy_sync(ob, ob->proxy, arm->layer_protected);
-  }
-
   BKE_pose_update_constraint_flags(pose); /* for IK detection for example */
 
   pose->flag &= ~POSE_RECALC;
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 05c318663e9..73a396b2cdd 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -850,10 +850,6 @@ void BKE_pose_eval_init(struct Depsgraph *depsgraph, Scene *UNUSED(scene), Objec
   }
 
   BLI_assert(pose->chan_array != NULL || BLI_listbase_is_empty(&pose->chanbase));
-
-  if (object->proxy != NULL) {
-    object->proxy->proxy_from = object;
-  }
 }
 
 void BKE_pose_eval_init_ik(struct Depsgraph *depsgraph, Scene *scene, Object *object)
@@ -1070,57 +1066,3 @@ void BKE_pose_eval_cleanup(struct Depsgraph *depsgraph, Scene *scene, Object *ob
   BIK_release_tree(scene, object, ctime);
   pose_eval_cleanup_common(object);
 }
-
-void BKE_pose_eval_proxy_init(struct Depsgraph *depsgraph, Object *object)
-{
-  BLI_assert(ID_IS_LINKED(object) && object->proxy_from != NULL);
-  DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
-
-  BLI_assert(object->pose->chan_array != NULL || BLI_listbase_is_empty(&object->pose->chanbase));
-}
-
-void BKE_pose_eval_proxy_done(struct Depsgraph *depsgraph, Object *object)
-{
-  BLI_assert(ID_IS_LINKED(object) && object->proxy_from != NULL);
-  DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
-}
-
-void BKE_pose_eval_proxy_cleanup(struct Depsgraph *depsgraph, Object *object)
-{
-  BLI_assert(ID_IS_LINKED(object) && object->proxy_from != NULL);
-  DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
-  pose_eval_cleanup_common(object);
-}
-
-void BKE_pose_eval_proxy_copy_bone(struct Depsgraph *depsgraph, Object *object, int pchan_index)
-{
-  const bArmature *armature = (bArmature *)object->data;
-  if (armature->edbo != NULL) {
-    return;
-  }
-  BLI_assert(ID_IS_LINKED(object) && object->proxy_from != NULL);
-  bPoseChannel *pchan = pose_pchan_get_indexed(object, pchan_index);
-  BLI_assert(pchan != NULL);
-  DEG_debug_print_eval_subdata(
-      depsgraph, __func__, object->id.name, object, "pchan", pchan->name, pchan);
-  /* TODO(sergey): Use indexed lookup, once it's guaranteed to be kept
-   * around for the time while proxies are evaluating.
-   */
-#if 0
-  bPoseChannel *pchan_from = pose_pchan_get_indexed(object->proxy_from, pchan_index);
-#else
-  bPoseChannel *pchan_from = BKE_pose_channel_find_name(object->proxy_from->pose, pchan->name);
-#endif
-  if (pchan_from == NULL) {
-    printf(
-        "WARNING: Could not find bone %s in linked ID anymore... "
-        "You should delete and re-generate your proxy.\n",
-        pchan->name);
-    return;
-  }
-  BKE_pose_copy_pchan_result(pchan, pchan_from);
-  copy_dq_dq(&pchan->runtime.deform_dual_quat, &pchan_from->runtime.deform_dual_quat);
-  BKE_pchan_bbone_segments_cache_copy(pchan, pchan_from);
-
-  pose_channel_flush_to_orig_if_needed(depsgraph, object, pchan);
-}
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index 94d14b63437..025d16007d8 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -1061,10 +1061,6 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
     if (item->action != LINK_APPEND_ACT_UNSET) {
       /* Already set, pass. */
     }
-    if (GS(id->name) == ID_OB && ((Object *)id)->proxy_from != NULL) {
-      CLOG_INFO(&LOG, 3, "Appended ID '%s' is proxified, keeping it linked...", id->name);
-      item->action = LINK_APPEND_ACT_KEEP_LINKED;
-    }
     else if (do_reuse_local_id && existing_local_id != NULL) {
       CLOG_INFO(&LOG, 3, "Appended ID '%s' as a matching local one, re-using it...", id->name);
       item->action = LINK_APPEND_ACT_REUSE_LOCAL;
@@ -1119,10 +1115,7 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
         local_appended_new_id = id->newid;
         break;
       case LINK_APPEND_ACT_MAKE_LOCAL:
-        BKE_lib_id_make_local(bmain,
-                              id,
-                              make_local_common_flags | LIB_ID_MAKELOCAL_FORCE_LOCAL |
-                                  LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING);
+        BKE_lib_id_make_local(bmain, id, make_local_common_flags | LIB_ID_MAKELOCAL_FORCE_LOCAL);
         BLI_assert(id->newid == NULL);
         local_appended_new_id = id;
         break;
@@ -1231,52 +1224,6 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
       continue;
     }
     BLI_assert(ID_IS_LINKED(id));
-
-    /* Attempt to re-link copied proxy objects. This allows appending of an entire scene
-     * from another blend file into this one, even when that blend file contains proxified
-     * armatures that have local references. Since the proxified object needs to be linked
-     * (not local), this will only work when the "Localize all" checkbox is disabled.
-     * TL;DR: this is a dirty hack on top of an already weak feature (proxies). */
-    if (GS(id->name) == ID_OB && ((Object *)id)->proxy != NULL) {
-      Object *ob = (Object *)id;
-      Object *ob_new = (Object *)id->newid;
-      bool is_local = false, is_lib = false;
-
-      /* Proxies only work when the proxified object is linked-in from a library. */
-      if (!ID_IS_LINKED(ob->proxy)) {
-        CLOG_WARN(&LOG,
-                  "Proxy object %s will lose its link to %s, because the "
-                  "proxified object is local",
-                  id->newid->name,
-                  ob->proxy->id.name);
-        continue;
-      }
-
-      BKE_library_ID_test_usages(bmain, id, &is_local, &is_lib);
-
-      /* We can only switch the proxy'ing to a made-local proxy if it is no longer
-       * referred to from a library. Not checking for local use; if new local proxy
-       * was not used locally would be a nasty bug! */
-      if (is_local || is_lib) {
-        CLOG_WARN(&LOG,
-                  "Made-local proxy object %s will lose its link to %s, "
-                  "because the linked-in proxy is referenced (is_local=%i, is_lib=%i)",
-                  id->newid->name,
-                  ob->proxy->id.name,
-                  is_local,
-                  is_lib);
-      }
-      else {
-        /* we can switch the proxy'ing from the linked-in to the made-local proxy.
-         * BKE_object_make_proxy() shouldn't be used here, as it allocates memory that
-         * was already allocated by object_make_local() (which called BKE_object_copy). */
-        ob_new->proxy = ob->proxy;
-        ob_new->proxy_group = ob->proxy_group;
-        ob_new->proxy_from = ob->proxy_from;
-        ob_new->proxy->proxy_from = ob_new;
-        ob->proxy = ob->proxy_from = ob->proxy_group = NULL;
-      }
-    }
   }
 
   BKE_main_id_newptr_and_tag_clear(bmain);
@@ -1568,7 +1515,6 @@ void BKE_blendfile_library_relocate(BlendfileLinkAppendContext *lapp_context,
 
   /* Note that in reload case, we also want to replace indirect usages. */
   const short remap_flags = ID_REMAP_SKIP_NEVER_NULL_USAGE |
-                            ID_REMAP_NO_INDIRECT_PROXY_DATA_USAGE |
                             (do_reload ? 0 : ID_REMAP_SKIP_INDIRECT_USAGE);
   for (item_idx = 0, itemlink = lapp_context->items.list; itemlink;
        item_idx++, itemlink = itemlink->next) {
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index f013ef99dde..3b7f91b93c0 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -5850,14 +5850,6 @@ static void add_new_constraint_to_list(Object *ob, bPoseChannel *pchan, bConstra
     BLI_addtail(list, con);
     BKE_constraint_unique_name(con, list);
 
-    /* if the target list is a list on some PoseChannel belonging to a proxy-protected
-     * Armature layer, we must tag newly added constraints with a flag which allows them
-     * to persist after proxy syncing has been done
-     */
-    if (BKE_constraints_proxylocked_owner(ob, pchan)) {
-      con->flag |= CONSTRAINT_PROXY_LOCAL;
-    }
-
     /* make this constraint the active one */
     BKE_constraints_active_set(list, con);
   }
@@ -6213,45 +6205,6 @@ bool BKE_constraint_is_nonlocal_in_liboverride(const Object *ob, const bConstrai
           (con == NULL || (con->flag & CONSTRAINT_OVERRIDE_LIBRARY_LOCAL) == 0));
 }
 
-/* -------- Constraints and Proxies ------- */
-
-void BKE_constraints_proxylocal_extract(ListBase *dst, ListBase *src)
-{
-  bConstraint *con, *next;
-
-  /* for each tagged constraint, remove from src and move to dst */
-  for (con = src->first; con; con = next) {
-    next = con->next;
-
-    /* check if tagged */
-    if (con->flag & CONSTRAINT_PROXY_LOCAL) {
-      BLI_remlink(src, con);
-      BLI_addtail(dst, con);
-    }
-  }
-}
-
-bool BKE_constraints_proxylocked_owner(Object *ob, bPoseChannel *pchan)
-{
-  /* Currently, constraints can only be on object or bone level */
-  if (ob && ob->proxy) {
-    if (ob->pose && pchan) {
-      bArmature *arm = ob->data;
-
-      /* On bone-level, check if bone is on proxy-protected layer */
-      if ((pchan->bone) && (pchan->bone->layer & arm->layer_protected)) {
-        return true;
-      }
-    }
-    else {
-      /* FIXME: constraints on object-level are not handled well yet */
-      return true;
-    }
-  }
-
-  return false;
-}
-
 /* -------- Target-Matrix Stuff ------- */
 
 void BKE_constraint_target_matrix_get(struct Depsgraph *depsgraph,
diff --git a/source/blender/blenkernel/intern/fcurve_driver.c b/source/blender/blenkernel/intern/fcurve_driver.c
index ce30f80ba65..e71217fea9e 100644
--- a/source/blender/blenkernel/intern/fcurve_driver.c
+++ b/source/blender/blenkernel/intern/fcurve_driver.c
@@ -88,14 +88,6 @@ typedef struct DriverVarTypeInfo {
 /** \name Driver Target Utilities
  * \{ */
 
-static ID *dtar_id_ensure_proxy_from(ID *id)
-{
-  if (id && GS(id->name) == ID_OB && ((Object *)id)->proxy_from) {
-    return (ID *)(((Object *)id)->proxy_from);
-  }
-  return id;
-}
-
 /**
  * Helper function to obtain a value using RNA from the specified source
  * (for evaluating drivers).
@@ -113,7 +105,7 @@ static float dtar_get_prop_val(ChannelDriver *driver, DriverTarget *dtar)
     return 0.0f;
   }
 
-  id = dtar_id_ensure_proxy_from(dtar->id);
+  id = dtar->id;
 
   /* Error check for missing pointer. */
   if (id == NULL) {
@@ -217,7 +209,7 @@ bool driver_get_variable_property(ChannelDriver *driver,
     return false;
   }
 
-  id = dtar_id_ensure_proxy_from(dtar->id);
+  id = dtar->id;
 
   /* Error check for missing pointer. */
   if (id == NULL) {
@@ -273,7 +265,7 @@ static short driver_check_valid_targets(ChannelDriver *driver, DriverVar *dvar)
   short valid_targets = 0;
 
   DRIVER_TARGETS_USED_LOOPER_BEGIN (dvar) {
-    Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id);
+    Object *ob = (Object *)dtar->id;
 
     /* Check if this target has valid data. */
     if ((ob == NULL) || (GS(ob->id.name) != ID_OB)) {
@@ -328,7 +320,7 @@ static float dvar_eval_rotDiff(ChannelDriver *driver, DriverVar *dvar)
   for (int i = 0; i < 2; i++) {
     /* Get pointer to loc values to store in. */
     DriverTarget *dtar = &dvar->targets[i];
-    Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id);
+    Object *ob = (Object *)dtar->id;
     bPoseChannel *pchan;
 
     /* After the checks above, the targets should be valid here. */
@@ -389,7 +381,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar)
   /* NOTE: for now, these are all just world-space */
   DRIVER_TARGETS_USED_LOOPER_BEGIN (dvar) {
     /* Get pointer to loc values to store in. */
-    Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id);
+    Object *ob = (Object *)dtar->id;
     bPoseChannel *pchan;
     float tmp_loc[3];
 
@@ -472,7 +464,7 @@ static float dvar_eval_locDiff(ChannelDriver *driver, DriverVar *dvar)
 static float dvar_eval_transChan(ChannelDriver *driver, DriverVar *dvar)
 {
   DriverTarget *dtar = &dvar->targets[0];
-  Object *ob = (Object *)dtar_id_ensure_proxy_from(dtar->id);
+  Object *ob = (Object *)dtar->id;
   bPoseChannel *pchan;
   float mat[4][4];
   float oldEul[3] = {0.0f, 0.0f, 0.0f};
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 49a518607f1..6c19c7a328b 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -1918,7 +1918,6 @@ void BKE_library_make_local(Main *bmain,
        * but complicates slightly the pre-processing of relations between IDs at step 2... */
       else if (!do_skip && id->tag & (LIB_TAG_EXTERN | LIB_TAG_INDIRECT | LIB_TAG_NEW) &&
                ELEM(lib, NULL, id->lib) &&
-               !(GS(id->name) == ID_OB && ((Object *)id)->proxy_from != NULL) &&
                ((untagged_only == false) || !(id->tag & LIB_TAG_PRE_EXISTING))) {
         BLI_linklist_prepend_arena(&todo_ids, id, linklist_mem);
         id->tag |= LIB_TAG_DOIT;
@@ -1982,12 +1981,8 @@ void BKE_library_make_local(Main *bmain,
       }
     }
     else {
-      /* In this specific case, we do want to make ID local even if it has no local usage yet...
-       * Note that for objects, we don't want proxy pointers to be cleared yet. This will happen
-       * down the road in this function.
-       */
-      BKE_lib_id_make_local(
-          bmain, id, LIB_ID_MAKELOCAL_FULL_LIBRARY | LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING);
+      /* In this specific case, we do want to make ID local even if it has no local usage yet... */
+      BKE_lib_id_make_local(bmain, id, LIB_ID_MAKELOCAL_FULL_LIBRARY);
 
       if (id->newid) {
         if (GS(id->newid->name) == ID_OB) {
@@ -2049,62 +2044,6 @@ void BKE_library_make_local(Main *bmain,
   TIMEIT_VALUE_PRINT(make_local);
 #endif
 
-  /* Step 5: proxy 'remapping' hack. */
-  for (LinkNode *it = copied_ids; it; it = it->next) {
-    ID *id = it->link;
-
-    /* Attempt to re-link copied proxy objects. This allows appending of an entire scene
-     * from another blend file into this one, even when that blend file contains proxified
-     * armatures that have local references. Since the proxified object needs to be linked
-     * (not local), this will only work when the "Localize all" checkbox is disabled.
-     * TL;DR: this is a dirty hack on top of an already weak feature (proxies). */
-    if (GS(id->name) == ID_OB && ((Object *)id)->proxy != NULL) {
-      Object *ob = (Object *)id;
-      Object *ob_new = (Object *)id->newid;
-      bool is_local = false, is_lib = false;
-
-      /* Proxies only work when the proxified object is linked-in from a library. */
-      if (!ID_IS_LINKED(ob->proxy)) {
-        CLOG_WARN(&LOG,
-                  "proxy object %s will lose its link to %s, because the "
-                  "proxified object is local.",
-                  id->newid->name,
-                  ob->proxy->id.name);
-        continue;
-      }
-
-      BKE_library_ID_test_usages(bmain, id, &is_local, &is_lib);
-
-      /* We can only switch the proxy'ing to a made-local proxy if it is no longer
-       * referred to from a library. Not checking for local use; if new local proxy
-       * was not used locally would be a nasty bug! */
-      if (is_local || is_lib) {
-        CLOG_WARN(&LOG,
-                  "made-local proxy object %s will lose its link to %s, "
-                  "because the linked-in proxy is referenced (is_local=%i, is_lib=%i).",
-                  id->newid->name,
-                  ob->proxy->id.name,
-                  is_local,
-                  is_lib);
-      }
-      else {
-        /* we can switch the proxy'ing from the linked-in to the made-local proxy.
-         * BKE_object_make_proxy() shouldn't be used here, as it allocates memory that
-         * was already allocated by object_make_local() (which called BKE_object_copy). */
-        ob_new->proxy = ob->proxy;
-        ob_new->proxy_group = ob->proxy_group;
-        ob_new->proxy_from = ob->proxy_from;
-        ob_new->proxy->proxy_from = ob_new;
-        ob->proxy = ob->proxy_from = ob->proxy_group = NULL;
-      }
-    }
-  }
-
-#ifdef DEBUG_TIME
-  printf("Step 5: Proxy 'remapping' hack: Done.\n");
-  TIMEIT_VALUE_PRINT(make_local);
-#endif
-
   /* This is probably more of a hack than something we should do here, but...
    * Issue is, the whole copying + remapping done in complex cases above may leave pose-channels
    * of armatures in complete invalid state (more precisely, the bone pointers of the
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index f4dd67cac28..5db70d85e71 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -265,8 +265,8 @@ static size_t id_delete(Main *bmain, const bool do_tagged_deletion)
       }
       for (id = last_remapped_id->next; id; id = id->next) {
         /* Will tag 'never NULL' users of this ID too.
-         * Note that we cannot use BKE_libblock_unlink() here,
-         * since it would ignore indirect (and proxy!)
+         *
+         * NOTE: #BKE_libblock_unlink() cannot be used here, since it would ignore indirect
          * links, this can lead to nasty crashing here in second, actual deleting loop.
          * Also, this will also flag users of deleted data that cannot be unlinked
          * (object using deleted obdata, etc.), so that they also get deleted. */
@@ -315,9 +315,9 @@ static size_t id_delete(Main *bmain, const bool do_tagged_deletion)
       }
 
       /* Will tag 'never NULL' users of this ID too.
-       * Note that we cannot use BKE_libblock_unlink() here, since it would ignore indirect
-       * (and proxy!) links, this can lead to nasty crashing here in second,
-       * actual deleting loop.
+       *
+       * NOTE: #BKE_libblock_unlink() cannot be used here, since it would ignore indirect
+       * links, this can lead to nasty crashing here in second, actual deleting loop.
        * Also, this will also flag users of deleted data that cannot be unlinked
        * (object using deleted obdata, etc.), so that they also get deleted. */
       BKE_libblock_remap_multiple_locked(bmain,
diff --git a/source/blender/blenkernel/intern/lib_override_proxy_conversion.c b/source/blender/blenkernel/intern/lib_override_proxy_conversion.c
index a61f6d821df..d99a9b57a6e 100644
--- a/source/blender/blenkernel/intern/lib_override_proxy_conversion.c
+++ b/source/blender/blenkernel/intern/lib_override_proxy_conversion.c
@@ -27,6 +27,9 @@
 
 #include "BLI_linklist.h"
 
+/* Required for proxy to liboverrides conversion code. */
+#define DNA_DEPRECATED_ALLOW
+
 #include "DNA_ID.h"
 #include "DNA_collection_types.h"
 #include "DNA_object_types.h"
diff --git a/source/blender/blenkernel/intern/lib_query.c b/source/blender/blenkernel/intern/lib_query.c
index 1f20a84098c..e73b53c4bf8 100644
--- a/source/blender/blenkernel/intern/lib_query.c
+++ b/source/blender/blenkernel/intern/lib_query.c
@@ -517,7 +517,7 @@ static int foreach_libblock_id_users_callback(LibraryIDLinkCallbackData *cb_data
   IDUsersIter *iter = cb_data->user_data;
 
   if (*id_p) {
-    /* 'Loopback' ID pointers (the ugly 'from' ones, Object->proxy_from and Key->from).
+    /* 'Loopback' ID pointers (the ugly 'from' ones, like Key->from).
      * Those are not actually ID usage, we can ignore them here.
      */
     if (cb_flag & IDWALK_CB_LOOPBACK) {
@@ -768,7 +768,7 @@ static int foreach_libblock_used_linked_data_tag_clear_cb(LibraryIDLinkCallbackD
   bool *is_changed = cb_data->user_data;
 
   if (*id_p) {
-    /* The infamous 'from' pointers (Key.from, Object.proxy_from, ...).
+    /* The infamous 'from' pointers (Key.from, ...).
      * those are not actually ID usage, so we ignore them here. */
     if (cb_flag & IDWALK_CB_LOOPBACK) {
       return IDWALK_RET_NOP;
diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c
index c3ccedb9608..e4e0466416a 100644
--- a/source/blender/blenkernel/intern/lib_remap.c
+++ b/source/blender/blenkernel/intern/lib_remap.c
@@ -91,26 +91,18 @@ enum {
   ID_REMAP_IS_USER_ONE_SKIPPED = 1 << 1, /* There was some skipped 'user_one' usages of old_id. */
 };
 
-static void foreach_libblock_remap_callback_skip(const ID *id_owner,
-                                                 ID **id_ptr,
+static void foreach_libblock_remap_callback_skip(const ID *UNUSED(id_owner),
+                                                 ID **UNUSED(id_ptr),
                                                  IDRemap *id_remap_data,
                                                  const int cb_flag,
                                                  const bool is_indirect,
                                                  const bool is_reference,
                                                  const bool is_never_null,
-                                                 const bool is_obj,
+                                                 const bool UNUSED(is_obj),
                                                  const bool is_obj_editmode)
 {
   if (is_indirect) {
     id_remap_data->skipped_indirect++;
-    if (is_obj) {
-      Object *ob = (Object *)id_owner;
-      if (ob->data == *id_ptr && ob->proxy != NULL) {
-        /* And another 'Proudly brought to you by Proxy Hell' hack!
-         * This will allow us to avoid clearing 'LIB_EXTERN' flag of obdata of proxies... */
-        id_remap_data->skipped_direct++;
-      }
-    }
   }
   else if (is_never_null || is_obj_editmode || is_reference) {
     id_remap_data->skipped_direct++;
@@ -136,8 +128,7 @@ static void foreach_libblock_remap_callback_apply(ID *id_owner,
                                                   const int cb_flag,
                                                   const bool is_indirect,
                                                   const bool is_never_null,
-                                                  const bool force_user_refcount,
-                                                  const bool is_obj_proxy)
+                                                  const bool force_user_refcount)
 {
   if (!is_never_null) {
     *id_ptr = new_id;
@@ -170,16 +161,9 @@ static void foreach_libblock_remap_callback_apply(ID *id_owner,
     /* We cannot affect old_id->us directly, LIB_TAG_EXTRAUSER(_SET)
      * are assumed to be set as needed, that extra user is processed in final handling. */
   }
-  if (!is_indirect || is_obj_proxy) {
+  if (!is_indirect) {
     id_remap_data->status |= ID_REMAP_IS_LINKED_DIRECT;
   }
-  /* We need to remap proxy_from pointer of remapped proxy... sigh. */
-  if (is_obj_proxy && new_id != NULL) {
-    Object *ob = (Object *)id_owner;
-    if (ob->proxy == (Object *)new_id) {
-      ob->proxy->proxy_from = ob;
-    }
-  }
 }
 
 static int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data)
@@ -221,12 +205,9 @@ static int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data)
   const bool is_reference = (cb_flag & IDWALK_CB_OVERRIDE_LIBRARY_REFERENCE) != 0;
   const bool is_indirect = (cb_flag & IDWALK_CB_INDIRECT_USAGE) != 0;
   const bool skip_indirect = (id_remap_data->flag & ID_REMAP_SKIP_INDIRECT_USAGE) != 0;
-  /* NOTE: proxy usage implies LIB_TAG_EXTERN, so on this aspect it is direct,
-   * on the other hand since they get reset to lib data on file open/reload it is indirect too.
-   * Edit Mode is also a 'skip direct' case. */
   const bool is_obj = (GS(id_owner->name) == ID_OB);
-  const bool is_obj_proxy = (is_obj &&
-                             (((Object *)id_owner)->proxy || ((Object *)id_owner)->proxy_group));
+  /* NOTE: Edit Mode is a 'skip direct' case, unless specifically requested, obdata should not be
+   * remapped in this situation. */
   const bool is_obj_editmode = (is_obj && BKE_object_is_in_editmode((Object *)id_owner) &&
                                 (id_remap_data->flag & ID_REMAP_FORCE_OBDATA_IN_EDITMODE) == 0);
   const bool is_never_null = ((cb_flag & IDWALK_CB_NEVER_NULL) && (new_id == NULL) &&
@@ -281,8 +262,7 @@ static int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data)
                                           cb_flag,
                                           is_indirect,
                                           is_never_null,
-                                          force_user_refcount,
-                                          is_obj_proxy);
+                                          force_user_refcount);
   }
 
   return IDWALK_RET_NOP;
@@ -430,10 +410,7 @@ static void libblock_remap_data(
     Main *bmain, ID *id, ID *old_id, ID *new_id, const short remap_flags, IDRemap *r_id_remap_data)
 {
   IDRemap id_remap_data;
-  const int foreach_id_flags = ((remap_flags & ID_REMAP_NO_INDIRECT_PROXY_DATA_USAGE) != 0 ?
-                                    IDWALK_NO_INDIRECT_PROXY_DATA_USAGE :
-                                    IDWALK_NOP) |
-                               ((remap_flags & ID_REMAP_FORCE_INTERNAL_RUNTIME_POINTERS) != 0 ?
+  const int foreach_id_flags = ((remap_flags & ID_REMAP_FORCE_INTERNAL_RUNTIME_POINTERS) != 0 ?
                                     IDWALK_DO_INTERNAL_RUNTIME_POINTERS :
                                     IDWALK_NOP);
 
diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc
index 41221c0e444..df7dce51672 100644
--- a/source/blender/blenkernel/intern/object.cc
+++ b/source/blender/blenkernel/intern/object.cc
@@ -333,7 +333,6 @@ static void object_make_local(Main *bmain, ID *id, const int flags)
 
   Object *ob = (Object *)id;
   const bool lib_local = (flags & LIB_ID_MAKELOCAL_FULL_LIBRARY) != 0;
-  const bool clear_proxy = (flags & LIB_ID_MAKELOCAL_OBJECT_NO_PROXY_CLEARING) == 0;
 
   bool force_local, force_copy;
   BKE_lib_id_make_local_generic_action_define(bmain, id, flags, &force_local, &force_copy);
@@ -341,20 +340,11 @@ static void object_make_local(Main *bmain, ID *id, const int flags)
   if (force_local) {
     BKE_lib_id_clear_library_data(bmain, &ob->id, flags);
     BKE_lib_id_expand_local(bmain, &ob->id, flags);
-    if (clear_proxy) {
-      if (ob->proxy_from != nullptr) {
-        ob->proxy_from->proxy = nullptr;
-        ob->proxy_from->proxy_group = nullptr;
-      }
-      ob->proxy = ob->proxy_from = ob->proxy_group = nullptr;
-    }
   }
   else if (force_copy) {
     Object *ob_new = (Object *)BKE_id_copy(bmain, &ob->id);
     id_us_min(&ob_new->id);
 
-    ob_new->proxy = ob_new->proxy_from = ob_new->proxy_group = nullptr;
-
     /* setting newid is mandatory for complex make_lib_local logic... */
     ID_NEW_SET(ob, ob_new);
 
@@ -419,51 +409,25 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
 {
   Object *object = (Object *)id;
 
-  /* Object is special, proxies make things hard... */
-  const int proxy_cb_flag = ((BKE_lib_query_foreachid_process_flags_get(data) &
-                              IDWALK_NO_INDIRECT_PROXY_DATA_USAGE) == 0 &&
-                             (object->proxy || object->proxy_group)) ?
-                                IDWALK_CB_INDIRECT_USAGE :
-                                0;
-
   /* object data special case */
   if (object->type == OB_EMPTY) {
     /* empty can have nullptr or Image */
-    BKE_LIB_FOREACHID_PROCESS_ID(data, object->data, proxy_cb_flag | IDWALK_CB_USER);
+    BKE_LIB_FOREACHID_PROCESS_ID(data, object->data, IDWALK_CB_USER);
   }
   else {
     /* when set, this can't be nullptr */
     if (object->data) {
-      BKE_LIB_FOREACHID_PROCESS_ID(
-          data, object->data, proxy_cb_flag | IDWALK_CB_USER | IDWALK_CB_NEVER_NULL);
+      BKE_LIB_FOREACHID_PROCESS_ID(data, object->data, IDWALK_CB_USER | IDWALK_CB_NEVER_NULL);
     }
   }
 
   BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->parent, IDWALK_CB_NEVER_SELF);
   BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->track, IDWALK_CB_NEVER_SELF);
-  /* object->proxy is refcounted, but not object->proxy_group... *sigh* */
-  BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->proxy, IDWALK_CB_USER | IDWALK_CB_NEVER_SELF);
-  BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->proxy_group, IDWALK_CB_NOP);
-
-  /* Special case!
-   * Since this field is set/owned by 'user' of this ID (and not ID itself),
-   * it is only indirect usage if proxy object is linked... Twisted. */
-  {
-    const int cb_flag_orig = BKE_lib_query_foreachid_process_callback_flag_override(
-        data,
-        (object->proxy_from != nullptr && ID_IS_LINKED(object->proxy_from)) ?
-            IDWALK_CB_INDIRECT_USAGE :
-            0,
-        true);
-    BKE_LIB_FOREACHID_PROCESS_IDSUPER(
-        data, object->proxy_from, IDWALK_CB_LOOPBACK | IDWALK_CB_NEVER_SELF);
-    BKE_lib_query_foreachid_process_callback_flag_override(data, cb_flag_orig, true);
-  }
 
   BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->poselib, IDWALK_CB_USER);
 
   for (int i = 0; i < object->totcol; i++) {
-    BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->mat[i], proxy_cb_flag | IDWALK_CB_USER);
+    BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, object->mat[i], IDWALK_CB_USER);
   }
 
   /* Note that ob->gpd is deprecated, so no need to handle it here. */
@@ -476,8 +440,6 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
   /* Note that ob->effect is deprecated, so no need to handle it here. */
 
   if (object->pose) {
-    const int cb_flag_orig = BKE_lib_query_foreachid_process_callback_flag_override(
-        data, proxy_cb_flag, false);
     LISTBASE_FOREACH (bPoseChannel *, pchan, &object->pose->chanbase) {
       BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL(
           data,
@@ -492,7 +454,6 @@ static void object_foreach_id(ID *id, LibraryForeachIDData *data)
           BKE_constraints_id_loop(
               &pchan->constraints, library_foreach_constraintObjectLooper, data));
     }
-    BKE_lib_query_foreachid_process_callback_flag_override(data, cb_flag_orig, true);
   }
 
   if (object->rigidbody_constraint) {
@@ -627,9 +588,6 @@ static void object_blend_write(BlendWriter *writer, ID *id, const void *id_addre
   bArmature *arm = nullptr;
   if (ob->type == OB_ARMATURE) {
     arm = (bArmature *)ob->data;
-    if (arm && ob->pose && arm->act_bone) {
-      BLI_strncpy(ob->pose->proxy_act_bone, arm->act_bone->name, sizeof(ob->pose->proxy_act_bone));
-    }
   }
 
   BKE_pose_blend_write(writer, ob->pose, arm);
@@ -2873,161 +2831,6 @@ bool BKE_object_obdata_is_libdata(const Object *ob)
   return (ob && ob->data && ID_IS_LINKED(ob->data));
 }
 
-/* -------------------------------------------------------------------- */
-/** \name Object Proxy API
- * \{ */
-
-/* when you make proxy, ensure the exposed layers are extern */
-static void armature_set_id_extern(Object *ob)
-{
-  bArmature *arm = (bArmature *)ob->data;
-  unsigned int lay = arm->layer_protected;
-
-  LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
-    if (!(pchan->bone->layer & lay)) {
-      id_lib_extern((ID *)pchan->custom);
-    }
-  }
-}
-
-void BKE_object_copy_proxy_drivers(Object *ob, Object *target)
-{
-  if ((target->adt) && (target->adt->drivers.first)) {
-
-    /* add new animdata block */
-    if (!ob->adt) {
-      ob->adt = BKE_animdata_ensure_id(&ob->id);
-    }
-
-    /* make a copy of all the drivers (for now), then correct any links that need fixing */
-    BKE_fcurves_free(&ob->adt->drivers);
-    BKE_fcurves_copy(&ob->adt->drivers, &target->adt->drivers);
-
-    LISTBASE_FOREACH (FCurve *, fcu, &ob->adt->drivers) {
-      ChannelDriver *driver = fcu->driver;
-
-      LISTBASE_FOREACH (DriverVar *, dvar, &driver->variables) {
-        /* all drivers */
-        DRIVER_TARGETS_LOOPER_BEGIN (dvar) {
-          if (dtar->id) {
-            if ((Object *)dtar->id == target) {
-              dtar->id = (ID *)ob;
-            }
-            else {
-              /* only on local objects because this causes indirect links
-               * 'a -> b -> c', blend to point directly to a.blend
-               * when a.blend has a proxy that's linked into `c.blend`. */
-              if (!ID_IS_LINKED(ob)) {
-                id_lib_extern((ID *)dtar->id);
-              }
-            }
-          }
-        }
-        DRIVER_TARGETS_LOOPER_END;
-      }
-    }
-  }
-}
-
-void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob)
-{
-  /* paranoia checks */
-  if (ID_IS_LINKED(ob) || !ID_IS_LINKED(target)) {
-    CLOG_ERROR(&LOG, "cannot make proxy");
-    return;
-  }
-
-  ob->proxy = target;
-  id_us_plus(&target->id);
-  ob->proxy_group = cob;
-
-  DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
-  DEG_id_tag_update(&target->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_ANIMATION);
-
-  /* copy transform
-   * - cob means this proxy comes from a collection, just apply the matrix
-   *   so the object won't move from its dupli-transform.
-   *
-   * - no cob means this is being made from a linked object,
-   *   this is closer to making a copy of the object - in-place. */
-  if (cob) {
-    ob->rotmode = target->rotmode;
-    mul_m4_m4m4(ob->obmat, cob->obmat, target->obmat);
-    if (cob->instance_collection) { /* should always be true */
-      float tvec[3];
-      mul_v3_mat3_m4v3(tvec, ob->obmat, cob->instance_collection->instance_offset);
-      sub_v3_v3(ob->obmat[3], tvec);
-    }
-    BKE_object_apply_mat4(ob, ob->obmat, false, true);
-  }
-  else {
-    BKE_object_transform_copy(ob, target);
-    ob->parent = target->parent; /* libdata */
-    copy_m4_m4(ob->parentinv, target->parentinv);
-  }
-
-  /* copy animdata stuff - drivers only for now... */
-  BKE_object_copy_proxy_drivers(ob, target);
-
-  /* skip constraints? */
-  /* FIXME: this is considered by many as a bug */
-
-  /* set object type and link to data */
-  ob->type = target->type;
-  ob->data = target->data;
-  id_us_plus((ID *)ob->data); /* ensures lib data becomes LIB_TAG_EXTERN */
-
-  /* copy material and index information */
-  ob->actcol = ob->totcol = 0;
-  if (ob->mat) {
-    MEM_freeN(ob->mat);
-  }
-  if (ob->matbits) {
-    MEM_freeN(ob->matbits);
-  }
-  ob->mat = nullptr;
-  ob->matbits = nullptr;
-  if ((target->totcol) && (target->mat) && OB_TYPE_SUPPORT_MATERIAL(ob->type)) {
-    int i;
-
-    ob->actcol = target->actcol;
-    ob->totcol = target->totcol;
-
-    ob->mat = (Material **)MEM_dupallocN(target->mat);
-    ob->matbits = (char *)MEM_dupallocN(target->matbits);
-    for (i = 0; i < target->totcol; i++) {
-      /* don't need to run BKE_object_materials_test
-       * since we know this object is new and not used elsewhere */
-      id_us_plus((ID *)ob->mat[i]);
-    }
-  }
-
-  /* type conversions */
-  if (target->type == OB_ARMATURE) {
-    copy_object_pose(ob, target, 0); /* data copy, object pointers in constraints */
-    BKE_pose_rest(ob->pose, false);  /* clear all transforms in channels */
-    BKE_pose_rebuild(bmain, ob, (bArmature *)ob->data, true); /* set all internal links */
-
-    armature_set_id_extern(ob);
-  }
-  else if (target->type == OB_EMPTY) {
-    ob->empty_drawtype = target->empty_drawtype;
-    ob->empty_drawsize = target->empty_drawsize;
-  }
-
-  /* copy IDProperties */
-  if (ob->id.properties) {
-    IDP_FreeProperty(ob->id.properties);
-    ob->id.properties = nullptr;
-  }
-  if (target->id.properties) {
-    ob->id.properties = IDP_CopyProperty(target->id.properties);
-  }
-
-  /* copy drawtype info */
-  ob->dt = target->dt;
-}
-
 void BKE_object_obdata_size_init(struct Object *ob, const float size)
 {
   /* apply radius as a scale to types that support it */
@@ -3069,8 +2872,6 @@ void BKE_object_obdata_size_init(struct Object *ob, const float size)
   }
 }
 
-/** \} */
-
 /* -------------------------------------------------------------------- */
 /** \name Object Matrix Get/Set API
  * \{ */
@@ -4362,33 +4163,10 @@ void BKE_object_tfm_restore(Object *ob, void *obtfm_pt)
 /** \name Object Evaluation/Update API
  * \{ */
 
-static void object_handle_update_proxy(Depsgraph *depsgraph,
-                                       Scene *scene,
-                                       Object *object,
-                                       const bool do_proxy_update)
-{
-  /* The case when this is a collection proxy, object_update is called in collection.c */
-  if (object->proxy == nullptr) {
-    return;
-  }
-  /* set pointer in library proxy target, for copying, but restore it */
-  object->proxy->proxy_from = object;
-  // printf("set proxy pointer for later collection stuff %s\n", ob->id.name);
-
-  /* the no-group proxy case, we call update */
-  if (object->proxy_group == nullptr) {
-    if (do_proxy_update) {
-      // printf("call update, lib ob %s proxy %s\n", ob->proxy->id.name, ob->id.name);
-      BKE_object_handle_update(depsgraph, scene, object->proxy);
-    }
-  }
-}
-
 void BKE_object_handle_update_ex(Depsgraph *depsgraph,
                                  Scene *scene,
                                  Object *ob,
-                                 RigidBodyWorld *rbw,
-                                 const bool do_proxy_update)
+                                 RigidBodyWorld *rbw)
 {
   const ID *object_data = (ID *)ob->data;
   const bool recalc_object = (ob->id.recalc & ID_RECALC_ALL) != 0;
@@ -4396,7 +4174,6 @@ void BKE_object_handle_update_ex(Depsgraph *depsgraph,
                                ((object_data->recalc & ID_RECALC_ALL) != 0) :
                                false;
   if (!recalc_object && !recalc_data) {
-    object_handle_update_proxy(depsgraph, scene, ob, do_proxy_update);
     return;
   }
   /* Speed optimization for animation lookups. */
@@ -4425,22 +4202,17 @@ void BKE_object_handle_update_ex(Depsgraph *depsgraph,
     if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) {
       printf("recalcob %s\n", ob->id.name + 2);
     }
-    /* Handle proxy copy for target. */
-    if (!BKE_object_eval_proxy_copy(depsgraph, ob)) {
-      BKE_object_where_is_calc_ex(depsgraph, scene, rbw, ob, nullptr);
-    }
+    BKE_object_where_is_calc_ex(depsgraph, scene, rbw, ob, nullptr);
   }
 
   if (recalc_data) {
     BKE_object_handle_data_update(depsgraph, scene, ob);
   }
-
-  object_handle_update_proxy(depsgraph, scene, ob, do_proxy_update);
 }
 
 void BKE_object_handle_update(Depsgraph *depsgraph, Scene *scene, Object *ob)
 {
-  BKE_object_handle_update_ex(depsgraph, scene, ob, nullptr, true);
+  BKE_object_handle_update_ex(depsgraph, scene, ob, nullptr);
 }
 
 void BKE_object_sculpt_data_create(Object *ob)
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 1a208355870..9c2b48303b2 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -190,16 +190,7 @@ void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
       break;
     }
     case OB_ARMATURE:
-      if (ID_IS_LINKED(ob) && ob->proxy_from) {
-        if (BKE_pose_copy_result(ob->pose, ob->proxy_from->pose) == false) {
-          printf("Proxy copy error, lib Object: %s proxy Object: %s\n",
-                 ob->id.name + 2,
-                 ob->proxy_from->id.name + 2);
-        }
-      }
-      else {
-        BKE_pose_where_is(depsgraph, scene, ob);
-      }
+      BKE_pose_where_is(depsgraph, scene, ob);
       break;
 
     case OB_MBALL:
@@ -311,33 +302,9 @@ void BKE_object_sync_to_original(Depsgraph *depsgraph, Object *object)
   object_sync_boundbox_to_original(object_orig, object);
 }
 
-bool BKE_object_eval_proxy_copy(Depsgraph *depsgraph, Object *object)
-{
-  /* Handle proxy copy for target, */
-  if (ID_IS_LINKED(object) && object->proxy_from) {
-    DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
-    if (object->proxy_from->proxy_group) {
-      /* Transform proxy into group space. */
-      Object *obg = object->proxy_from->proxy_group;
-      float imat[4][4];
-      invert_m4_m4(imat, obg->obmat);
-      mul_m4_m4m4(object->obmat, imat, object->proxy_from->obmat);
-      /* Should always be true. */
-      if (obg->instance_collection) {
-        add_v3_v3(object->obmat[3], obg->instance_collection->instance_offset);
-      }
-    }
-    else {
-      copy_m4_m4(object->obmat, object->proxy_from->obmat);
-    }
-    return true;
-  }
-  return false;
-}
-
-void BKE_object_eval_uber_transform(Depsgraph *depsgraph, Object *object)
+void BKE_object_eval_uber_transform(Depsgraph *UNUSED(depsgraph), Object *UNUSED(object))
 {
-  BKE_object_eval_proxy_copy(depsgraph, object);
+  return;
 }
 
 void BKE_object_data_batch_cache_dirty_tag(ID *object_data)