Merge "remove unused code in PrivacySettings"