Remove TODO from code, it moved to GitHub issues