Architectural Memory Debt

Audit and pay down architectural debt related to improper reference management.