Jena 2.11.0 and some cleanup