Update headers & remove IllusionSettings

Change-Id: I320e11b2e20ea0f97398cd990538397ba562f939