Cleanup before PR that adds inventory-server connectivity.