am 8ae8c761: Cleanup settings

* commit '8ae8c761493867be7364806cdc4d7103a46dc181':
  Cleanup settings