Remove JB specific code from ICS client