diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5e5a2e3c03..5b759dd125 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,19 +13,21 @@ requirements*.txt @lbianchi-lbl @ksbeattie
 # testing
 pytest*.ini @lbianchi-lbl
 conftest.py @lbianchi-lbl
-# Docs - need to identify owner(s)
+
+# Docs
+/docs @dangunter @bpaul4
 
 # Commands
-/idaes/commands/ @eslickj @dangunter
+/idaes/commands/ @dangunter
 
 # Core
-/idaes/core/ @andrewlee94 @eslickj @lbianchi-lbl
+/idaes/core/ @andrewlee94 @dallan-keylogic @lbianchi-lbl
 /idaes/core/dmf/ @dangunter
-/idaes/core/surrogate/ @andrewlee94 @carldlaird @bpaul4
+/idaes/core/surrogate/ @andrewlee94 @bpaul4 @avdudchenko @rundxdi
 /idaes/core/ui/ @dangunter
 
 # Models
-/idaes/models/ @andrewlee94 @eslickj
+/idaes/models/ @andrewlee94 @bpaul4
 
 # Apps - each package needs a maintainer
 /idaes/apps/caprese/ @Robbybp
@@ -39,10 +41,10 @@ conftest.py @lbianchi-lbl
 /idaes/models_extra/column_models/ @aostace01 @agarciadiego
 /idaes/models_extra/gas_distribution/ @Robbybp
 /idaes/models_extra/gas_solids_contactors/ @aostace01
-/idaes/models_extra/power_generation/ @eslickj @MAZamarripa
+/idaes/models_extra/power_generation/ @bpaul4 @MAZamarripa
 /idaes/models_extra/power_generation/costing/ @MAZamarripa @AlexNoring
-/idaes/models_extra/power_generation/properties/ @eslickj @AlexNoring
-/idaes/models_extra/power_generation/unit_models/soc_submodels/ @eslickj @dallan-keylogic
+/idaes/models_extra/power_generation/properties/ @bpaul4 @AlexNoring
+/idaes/models_extra/power_generation/unit_models/soc_submodels/ @bpaul4 @dallan-keylogic
 
 # Scripts
 /scripts/colab_helper.py @adowling2
\ No newline at end of file
diff --git a/docs_archive/transformations/index.rst b/docs_archive/transformations/index.rst
deleted file mode 100644
index 85ed326a39..0000000000
--- a/docs_archive/transformations/index.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Transformations
-===============
-
-Transformations offer a convenient way to make systematic changes to a model.
-
-.. toctree::
-
-    variable_replace
diff --git a/docs_archive/transformations/variable_replace.rst b/docs_archive/transformations/variable_replace.rst
deleted file mode 100644
index ebe524c2a2..0000000000
--- a/docs_archive/transformations/variable_replace.rst
+++ /dev/null
@@ -1,83 +0,0 @@
-Variable Replacement
-====================
-
-.. module:: idaes.core.plugins.variable_replace
-
-There are a number of cases where it can be convenient to replace one variable
-for another. IDAES offers a convenient variable replacement transformation. This
-transformation is not reversible and can significantly alter the model structure.
-
-An example use of this transformation, is a parameter estimation problem where
-a model contains several instances of a particular sub-model and each model
-contains a variable (:math:`\beta`) for a model parameter to be estimated. In
-many cases :math:`\beta` should be the same across all sub-models. One approach
-to this problem would be to add equality constraints to equate all the
-:math:`\beta`'s.  Another approach would be to use the variable replacement
-transformation to replace the individual :math:`\beta`'s with a single global
-:math:`\beta` variable.
-
-Example
--------
-
-The following example demonstrates the basic usage of the transformation.
-
-.. testcode::
-
-  import idaes.core.plugins # Load IDAES plugins
-  import pyomo.environ as pyo
-
-  # Use Pyomo's transformation factory to create the transformation object
-  rp = pyo.TransformationFactory("replace_variables")
-
-  # Create an example model
-  m = pyo.ConcreteModel()
-  m.x = pyo.Var({1,2,3}, initialize=2)
-  m.new_x = pyo.Var({1,2,3}, initialize=3)
-  m.e1 = pyo.Expression(expr=sum(m.x[i] for i in m.x))
-
-  # Apply the transformation to the model, the substitute argument contains a list
-  # of replacements, each element is a list-like object where the first element is
-  # a variable to be replaced by the second element.
-  rp.apply_to(m, substitute=[(m.x, m.new_x)])
-
-  # See that the variable was replaced
-  print(pyo.value(m.e1)) # since new_x has a value of 3 the expression value is 9
-
-Output:
-
-.. testoutput::
-
-    9
-
-Usage
------
-
-There are three basic steps to using the variable replacement transformation.
-
-  1. Import anything from the ``idaes`` package; this will cause the IDAES
-     plugins to be loaded.
-  2. Use Pyomo's transformation factory to create a variable replacement
-     transformation object (e.g.
-     ``rp = TransformationFactory("replace_variables")``.
-  3. Call the transformation object's ``apply_to()`` method to apply the
-     transformation.
-
-The ``apply_to(instance, substitute)`` method takes two arguments ``instance`` and
-``substitute``. The instance argument is a model or block to apply the transformation
-to. The substitute argument is a list-like object with substitutions.  Each element
-is a two-element list-like object where the first element is a Pyomo Var, IndexedVar
-element or Reference to the variable to replace and the second element is a Pyomo
-Var, IndexedVar element or Reference to replace the first element with.
-
-Indexed variables are allowed. The index set of the variable to replace must be
-a subset of the index set of the variable to replace it with. It can also be
-useful to use a Pyomo Reference to emulate an indexed variable, so this is also
-supported.
-
-ReplaceVariables Class
-----------------------
-
-The transformation object class is ReplaceVariables.
-
-.. autoclass:: ReplaceVariables
-  :members: