Merge "Fix cleanup command"