Improvements to NNCleanupProxy