Move get_client to a priv method, cleanup executor