Fix CleanUp command