defconfig update and kill the extras brought in from last caf merge