cleanup strings YIPPIEYEAH

Change-Id: I8ce69b159bd63c3b4b220e1abc2c7b7a48f6c0a9