Merge "cleanup on remote_client"