Spring CLean-up