Remove some more devices

Change-Id: Ie50da159e97d3a49aa91f9853ee2471da9488c12