Clean up and improved performance.