String cleanup

Change-Id: I7866a188640739d3c434882cace8ae52ecaf319f