remove global variable, some config changes