Swapping out side window crank shafts

Was about to send these to the paint shop when I realized that I had't swapped out the old worn shafts.

Drilling out the old rivets it pops out with some light tapping

Here is the spring that hold the window up.