Cleanup plumbing.core ns