CLEANUP: Vastly simplified Java support library.