Merge pull request #601 from afs/cleanup

JENA-1753: Cleanup