Remove implemented TODO markers