#4630 cleanup