Removed obsolete and unnecessary TODOs, see #8