Some cleanup to device driver
Removed publish overrides and changed dispatcher routing