Final infrastructure cleanup for a while