Remore some defers
Merge branch 'new-txn-package' into environ-resource-catalogs