Remove some TODO's.