Merge "Clean up the multi-client ror code"