ADSP Addon (FreeSurround) - Code cleanup