Tweaked cleanup.cmd