move xir and remove k8s sets