Settings: Cleanup CAF additions

Change-Id: I8e44eb28abb8c4d08ea453b7c4f3b21d75c00035