Mms: Cleanup CAF additions

Change-Id: I441560973c3a36918702080d379b993a9cc063ef