Clean up callsT and callsR TODOs