Start cleaning up all refs to use get_local_client