removed TODOs

added them as issues in GitHub