Removed TODO's set by CI Dev Team