Senate panel drops proposed state policy on tolls, but battle moves to budget