Solved some old 'TODO' comments