Cleaned up devices

Change-Id: I083bc1c450ba1f34cbb2f560867469cc20021e29