Cleanup of Java assistants