Cleanup USF-specific Java code