removed uneccessary devices

Change-Id: I17b39a5331124bc029c299f966284b04ca8afa7f
updated

Change-Id: Ibaaba0559ba9e0f55ca254da9e17c2df6cee8643