Removing TODO - moved it to GitHub's issues