12. Spring cleanup