Cleaning up, but why in Spring?