Remove vestiges of AdminSettings.php

This has been deprecated and mostly unused for quite some time.
Remove the few remaining uses that exist.

Change-Id: I522ef138d291cf7567250fef1de34bb41673bc6c
Merge "Remove vestiges of AdminSettings.php"