Merge "Remove unused config variables"