Add TODO, rm commented code