Adopt the new API.  The tests are still failing, but this is a mostly working checkpoint
Fix the maven build
Remove cruft.