Merge "Remove vestiges of AdminSettings.php"