Architectural Remediation