remove 2 TODO type comments