Spring cleaning the plumbing