Java cleanups.

Remove fulfilled TODO.