spring cleanup