Improve cleanup.