ADSP (Addon Basic)- Code cleanup