removed TODO markers