after ex8 cleanup