Fix v5/k5 cleanup