WIP: context_updated cleanup