Remove TODOs as there are issues open for them