Removed reference to distributed setups in case we skip them for the session