Cleanup.
Improve cleanup scripts.