USB: cleanup for previous patches