repo-tools clean up