Remove caf

Change-Id: Id9947381fe6f838d6736cf796c03485e4782c016