USB related changes

Here is patch set for usb interface. There is no improvements or fixes. Just clutter issue, which made me
crazy in my research.