spring cleanup

spring cleanup