Last change to get rid of globalsettingsmanager