Fixed CleanUp.