clean up some plumbing