Adhere conding conventions
Delete USB support for now