Moved TODO to GitHub issues