Clean up Java server code
Merge pull request #2799 from bootstraponline/java_clean_up

Clean up Java server code