clean up a TODO and avoid some un-necessary calls