Updated TODO, removed diagnostics