Merge "Remove unused config variables"
am: 1dde47d0b6

* commit '1dde47d0b6796c3f9c1ec2d41c6c2597f9f13242':
  Remove unused config variables