Spring tasks and tidy-up