Repo clean-up