[BSLWAC] Backstage - NAF Phase 3B Cleanup Update