diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
index ffdd09f8e..d02940a84 100644
--- a/.github/workflows/build-doc.yml
+++ b/.github/workflows/build-doc.yml
@@ -2,70 +2,8 @@ name: build-doc
 
 on: workflow_dispatch
 
-
 jobs:
 
-  build-doc-IEC61970_16v29a:
-    runs-on: ubuntu-latest
-    env:
-      USE_CIM_VERSION: IEC61970_16v29a
-    steps:
-    - uses: actions/checkout@v3    
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
-    - name: Install Doxygen
-      run: sudo apt-get install doxygen 
-      shell: bash 
-    - name: Install Graphviz
-      run: sudo apt-get install graphviz
-      shell: bash 
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
-      
-    - name: Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
-          make doc
-    - uses: actions/upload-artifact@v3
-      with:
-        name: doc_${{env.USE_CIM_VERSION}}
-        path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html
-        retention-days: 90
-
-
-
-  build-doc-IEC61970_17v07:
-    runs-on: ubuntu-latest
-    env:
-      USE_CIM_VERSION: IEC61970_17v07
-    steps:
-    - uses: actions/checkout@v3    
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
-    - name: Install Doxygen
-      run: sudo apt-get install doxygen 
-      shell: bash 
-    - name: Install Graphviz
-      run: sudo apt-get install graphviz
-      shell: bash 
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
-      
-    - name: Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
-          make doc
-    - uses: actions/upload-artifact@v3
-      with:
-        name: doc_${{env.USE_CIM_VERSION}}
-        path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html
-
   build-doc-IEC61970_16v29a_IEC61968_12v08:
     runs-on: ubuntu-latest
     env:
@@ -95,7 +33,6 @@ jobs:
         name: doc_${{env.USE_CIM_VERSION}}
         path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html
 
-
   build-doc-CGMES_2-4-15_27JAN2020:
     runs-on: ubuntu-latest
     env:
@@ -124,6 +61,3 @@ jobs:
       with:
         name: doc_${{env.USE_CIM_VERSION}}
         path: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/doc/html
-
-
-
diff --git a/.github/workflows/build-gh-pages.yml b/.github/workflows/build-gh-pages.yml
index a87843866..8af0d1e18 100644
--- a/.github/workflows/build-gh-pages.yml
+++ b/.github/workflows/build-gh-pages.yml
@@ -1,17 +1,13 @@
 name: build-gh-pages
  
- 
 on: [push]
 #on: workflow_dispatch
 
 jobs:
    build-gh-pages:
-    
     runs-on: ubuntu-latest
     env:
       USE_CIM_VERSION1: IEC61970_16v29a_IEC61968_12v08
-      USE_CIM_VERSION2: IEC61970_16v29a
-      USE_CIM_VERSION3: IEC61970_17v07
       USE_CIM_VERSION4: CGMES_2.4.15_27JAN2020
     steps:
     - uses: actions/checkout@v3   
@@ -37,42 +33,9 @@ jobs:
       run: |
           mkdir -p ./copy_files/docs
           cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION1}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION1}}
-          
-        
-    - name: CIM2 Create Build Environment 
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}
-      
-    - name: CIM2 Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION2}}
-          make doc
-    - name: CIM2 Copy
-      run: |
-          mkdir -p ./copy_files/docs
-          cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION2}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION2}}
-   
-    - name: CIM3 Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}
-      
-    - name: CIM3 Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION3}}
-          make doc
-    - name: CIM3 Copy 
-      run: |
-          mkdir -p ./copy_files/docs
-          cp -r ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION3}}/doc/html ./copy_files/docs/${{env.USE_CIM_VERSION3}}  
-  
-   
+             
     - name: CIM4 Create Build Environment 
       run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION4}}
-      
     - name: CIM4 Configure CMake and compile
       shell: bash
       working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION4}}/
diff --git a/.github/workflows/build-src.yml b/.github/workflows/build-src.yml
index 1d504d002..e53628e1c 100644
--- a/.github/workflows/build-src.yml
+++ b/.github/workflows/build-src.yml
@@ -3,61 +3,7 @@ name: build-src
 #on: [push]
 on: workflow_dispatch
 
-
 jobs:
-
-  build-src-IEC61970_16v29a:
-    runs-on: ubuntu-latest
-    env:
-      USE_CIM_VERSION: IEC61970_16v29a
-    steps:
-    - uses: actions/checkout@v3    
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
-    - name: Install Doxygen
-      run: sudo apt-get install doxygen 
-      shell: bash 
-    - name: Install Graphviz
-      run: sudo apt-get install graphviz
-      shell: bash 
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
-      
-    - name: Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
-          make -j4
-
-
-
-  build-src-IEC61970_17v07:
-    runs-on: ubuntu-latest
-    env:
-      USE_CIM_VERSION: IEC61970_17v07
-    steps:
-    - uses: actions/checkout@v3    
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
-    - name: Install Doxygen
-      run: sudo apt-get install doxygen 
-      shell: bash 
-    - name: Install Graphviz
-      run: sudo apt-get install graphviz
-      shell: bash 
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}
-      
-    - name: Configure CMake and compile
-      shell: bash
-      working-directory: ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}}/
-      run: |
-          cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}} 
-          cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
-          make -j4
-
   build-src-IEC61970_16v29a_IEC61968_12v08:
     runs-on: ubuntu-latest
     env:
@@ -83,10 +29,8 @@ jobs:
           cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
           make -j4
 
-
   build-src-CGMES_2-4-15_27JAN2020:
     runs-on: ubuntu-latest
-
     env:
       USE_CIM_VERSION: CGMES_2.4.15_27JAN2020
     steps:
@@ -109,4 +53,3 @@ jobs:
           cd ${{runner.workspace}}/libcimpp/build/${{env.USE_CIM_VERSION}} 
           cmake ../.. -DUSE_CIM_VERSION=${{env.USE_CIM_VERSION}}
           make -j4
-
diff --git a/README.md b/README.md
index 2f1bf4474..176901d57 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,7 @@ It is part of the CIM++ project. More on CIM++ can be found [here](http://rdcu.b
 
 Supported CIM / CGMES versions:
 - [CGMES_2.4.15_27JAN2020](https://sogno-platform.github.io/libcimpp/CGMES_2.4.15_27JAN2020/annotated.html)
-- [IEC61970 16v29a](https://sogno-platform.github.io/libcimpp/IEC61970_16v29a/annotated.html)
 - [IEC61970_16v29a_IEC61968_12v08](https://sogno-platform.github.io/libcimpp/IEC61970_16v29a_IEC61968_12v08/annotated.html)
-- [IEC61970_17v07](https://sogno-platform.github.io/libcimpp/IEC61970_17v07/annotated.html)
 
 ## General information
 limcimpp uses [arabica](http://www.jezuk.co.uk/cgi-bin/view/arabica) as cross platform wrapper around one of the XML parsers listed in the dependencies (see below).