Move cleanup to PowerShell script