One step before big cleanup.