Pass USB CV test verification;
Code cleanup;