Can you remove these TODOs ?