Remove some TODOX