Removed unused devices

Change-Id: I39d4e74e6ca96e8db6eb031845517c695c34e43e