Remove include that didn't really make sense as an include, it
is only used by one file.  Also simplfied todo a bit.