Tidy code and remove jars
Upgrade to Jakarta HttpClient 3.1.

This is only 5-6 years out of date as opposed to the 10+ for the
2.0 version we were using before. In the future we should move
to Apache HttpComponents 4.x, but that requires a more significant
change to the code.