Spring clean-up