diff --git a/.github/workflows/vs16.yml b/.github/workflows/vs16.yml
index 3ea27b3..c3ccc47 100644
--- a/.github/workflows/vs16.yml
+++ b/.github/workflows/vs16.yml
@@ -1,38 +1,19 @@
-name: vs19-ci
+name: Build & Test - MSVC
 
-on:
-  push:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-  pull_request:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
+on: [push, pull_request]
 
 jobs:
-  ci:
+  build-windows:
+    runs-on: windows-latest
     defaults:
       run:
         shell: bash
-    runs-on: ${{matrix.config.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-        - { os: windows-2019, vs: "Visual Studio 2020" }
-        build: [Debug, Release]
-        platform: [Win32, x64]
 
-    name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}"
     steps:
       - name: checkout
         uses: actions/checkout@v2
+        with:
+          cmake-version: '3.19.x'
 
       - name: Install dependencies
         run: script/ci_install_deps.sh
diff --git a/.github/workflows/win-icc.yml b/.github/workflows/win-icc.yml
deleted file mode 100644
index 84fd4fd..0000000
--- a/.github/workflows/win-icc.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: windows-latest-icc-ci
-
-on:
-  push:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-  pull_request:
-    branches:
-      - master
-      - feature/**
-      - improvement/**
-      - bugfix/**
-
-env:
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17453/w_BaseKit_p_2021.1.0.2664_offline.exe
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
-
-jobs:
-  windows_icc:
-    if: >-
-      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
-      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
-
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: bash
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: cache install
-      id: cache-install
-      uses: actions/cache@v2
-      with:
-        path: C:\Program Files (x86)\Intel\oneAPI\compiler
-        key: install-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_CPP_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
-
-    - name: Install icc
-      run: script/ci_install_icc.sh $WINDOWS_HPCKIT_URL $WINDOWS_CPP_COMPONENTS
-
-    - name: CMake
-      run: echo "/host_usr_local/bin" >> $GITHUB_PATH
-
-    - name: Install dependencies
-      run: script/ci_install_deps.sh
-
-    - name: Configure
-      run: >-
-        source script/ci_setup_icc.sh &&
-        cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
-
-    - name: Build
-      run: >-
-        source script/ci_setup_icc.sh &&
-        cmake --build build -j ${{ steps.cores.outputs.count }}
-
-    - name: Run
-      working-directory: build
-      run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
diff --git a/test/test_parser.cpp b/test/test_parser.cpp
index 888027f..ab5d8c9 100644
--- a/test/test_parser.cpp
+++ b/test/test_parser.cpp
@@ -1,5 +1,3 @@
-#include <optional>
-/*
 #include "test_helpers.hpp"
 #include <algorithm>
 #include <filesystem>
@@ -93,7 +91,6 @@ static void make_and_write(const std::string& file_name,
 
 TEST_CASE("parser test various cases") {
     unique_file_name f;
-    std::cout << __VERSION__ << std::endl;
     std::vector<X> data = {{1, 2, "x"}, {3, 4, "y"},  {5, 6, "z"},
                            {7, 8, "u"}, {9, 10, "v"}, {11, 12, "w"}};
     make_and_write(f.name, data);
@@ -737,4 +734,3 @@ TEST_CASE("parser test multiline restricted") {
     }
     CHECK_EQ(i, data);
 }
-*/