Delete deprecated code

Huge pull request (sorry, and sorry not split into separate commits cleanly!).

Deletes a bunch of deprecated stuff, including the JmxSensorAdapter code. The latter required a load of code and tests to be updated to the new way - hence such a big and time consuming pull request.