cleanup some TODOs, update for the API changes in CTS core.