Get rid of the whole modelid stuff, no supported device uses this crap

Change-Id: Ic269aa2c7af70bd589f0c656428032faf6de5ecf