Merge "Revert "Fix cleanup bug clearing script references.""