Cleaning up Maven dependencies. (7)
* Last bit of cruft cleanup. Need to test!