Move away from settingslogic