Spring field cleanup

P1010045