Tidy-up, link down clean-up into its own future