Configz
AG-3863: context cleanup