Spring cleanup