Cleanup strings for latest Slim merge

Change-Id: Ieb1a1ce74f9338fb1e691cf2da9c0f80d95c4dbf