backports repo setup cleanup