Removing some Devices

Change-Id: I5be1d13a6543e04f53a23e9aa3dd7089847116ff