Pointed out that the "TODO" comments should be left in the code.