Settings: Cleanup CAF array

Change-Id: I0ce9303ec4e67df328fbb07c8f18f5e002ac8ea6