Remove some TODO's that are implemented.