First part of cleanup cudi repositories