Remove code that hacks around fixed core issue 2904467

Removed the code that strips the _ from the start of the shipping method plugin service ids and changed the service IDs in the annotations back to integers.

I'm wondering if maybe we should remove the alphabetical sort too and just sort the annotations by hand. That code seems to run 10-20 times everytime I load a page with a shipping rate selection list in it.