Cleanup after separation from rust code#3

martinthomson wants to merge 5 commits intomainprivate-attribution/research-prototype:mainfrom

make-ci-workprivate-attribution/research-prototype:make-ci-workCopy head branch name to clipboard