Water: Use soil in StreamA

Remove extra model state file.