There go the last Java collections
Merge pull request #931 from pdalpra/cleanup

There go the last Java collections