Repo cleanup 2.0