More Repo cleanup