7 cleanup, 8