Java cleanup

This one will make sense to apply after the change to modify the .gitignore since it includes that one as well.