Merge "Remove unnecessary strings and labels." into nyc-dev am: a785c80
am: 31c3688

* commit '31c3688d0f67450a8d55c40d0c9e9ef1d2cab8c2':
  Remove unnecessary strings and labels.