Settings: Optimize systemsettings and cleanup