Clean up of administrative settings to reduce confusion.