move TODO out of header into comment