Preparing to remove legacy infrastructure