Spring cleanup 2