[Upgrade]: cleanup step updated