Remove some more unused devices

Change-Id: Ifde88090f3169463039a53f3a157a07438b21c7e