Merge "Fix cleanup bug clearing script references."