Remove other devices

Change-Id: Ic43c522887dae050351278944a3276c233a8a81c