Clean up some leftover performance files and strings
Merge "Clean up some leftover performance files and strings" into jb-mr1