Merge "Remove no longer needed sync settings/code"