Move & improve CAF strings

* Also remove unused ones

Change-Id: I33fdb6845b0a79c7eb6994c4ac658d4dd73d708f
3 files changed