More gentle cleanup.