More configuration clean up for clientConfiguration and serverConfiguration, email settings, templates, etc