removed old device descriptor cruft