Enhance CleanUp.