More TODO repo selection and cleanup