Improved system cleanup.