milestone3 cleanup