remove the TODO, we can file bugs for these.