Settings class cleanup