Remove libusbx references
Refactoring