Springwater sweep includes big cleanup

Springwater sweep includes big cleanup