Added TODO, removed stale 'debugger'.