Cleaning the repo, part II.