DC: cleanup strings

Change-Id: I4168c313bb49bdea6f640456c6516ff79406ba71