Merge "Remove unnecessary strings and labels." into nyc-dev