Merge "remove useless variable in sfdc config"