Revert "added todo"

Per discussion in PR #311, we keep java 6 compatibility for now.
Seem to have a merge conflict in here.