Some TODO clean up