Suspend infrastructure cleanup and extension