d2: Add VOIP devices

 * Also remove some cruft

Change-Id: I98c44864814335d880bff9a2907e4550b9ee2d83