Merge "Cleanup unused RefConfigSection.REF_CONFIG"