w07 d3 cleanup