Some minor fixes

-Remove duplicated string
-Fix a conflict due to a cherry-pick
-fix a derp