[repoapi] reduce repoapi usage where possible [applied]