More strings cleanup.