[cosmetic] Add TODO and, move TODO to header, and remove unneccessary debug statement