Re-enable full cleanup.