Spring cleanup - finished